PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Shared/OLE/PPS/Root.php

Doc Comments +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
      * If a resource pointer to a stream created by fopen() is passed
      * it will be used, but you have to close such stream by yourself.
      *
-     * @param string|resource $filename The name of the file or stream where to save the OLE container
+     * @param string|null $filename The name of the file or stream where to save the OLE container
      *
      * @throws \PhpOffice\PhpSpreadsheet\Writer\WriteException
      *
@@ -120,7 +120,7 @@ 
      *
      * @param array $raList Reference to an array of PPS's
      *
-     * @return float[] The array of numbers
+     * @return double[] The array of numbers
      */
     public function _calcSize(&$raList)
     {

Spacing +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
                 .pack('V', 0)// Extra BDList Count
             );
         } else {
-            fwrite($FILE, pack('V', $iAll + $iBdCnt).pack('V', $iBdExL));
+            fwrite($FILE, pack('V', $iAll + $iBdCnt) . pack('V', $iBdExL));
         }
 
         // BDList

src/PhpSpreadsheet/Shared/ZipArchive.php

Doc Comments +1 added lines, -1 removed lines

@@ -387,7 +387,7 @@
     /**
      * Get Contiguous
      *
-     * @return bool
+     * @return integer
      */
     public function getContiguous()
     {

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
 if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define('PCLZIP_TEMPORARY_DIR', File::sysGetTempDir().DIRECTORY_SEPARATOR);
+    define('PCLZIP_TEMPORARY_DIR', File::sysGetTempDir() . DIRECTORY_SEPARATOR);
 }
 
 use PhpOffice\PhpSpreadsheet\Shared\PCLZip\PclZip;
@@ -86,16 +86,16 @@ 
     {
         $filenameParts = pathinfo($localname);
 
-        $handle = fopen($this->tempDir.'/'.$filenameParts['basename'], 'wb');
+        $handle = fopen($this->tempDir . '/' . $filenameParts['basename'], 'wb');
         fwrite($handle, $contents);
         fclose($handle);
 
-        $res = $this->zip->add($this->tempDir.'/'.$filenameParts['basename'], PCLZIP_OPT_REMOVE_PATH, $this->tempDir, PCLZIP_OPT_ADD_PATH, $filenameParts['dirname']);
+        $res = $this->zip->add($this->tempDir . '/' . $filenameParts['basename'], PCLZIP_OPT_REMOVE_PATH, $this->tempDir, PCLZIP_OPT_ADD_PATH, $filenameParts['dirname']);
         if ($res == 0) {
-            throw new \PhpOffice\PhpSpreadsheet\Writer\WriteException('Error zipping files : '.$this->zip->errorInfo(true));
+            throw new \PhpOffice\PhpSpreadsheet\Writer\WriteException('Error zipping files : ' . $this->zip->errorInfo(true));
         }
 
-        unlink($this->tempDir.'/'.$filenameParts['basename']);
+        unlink($this->tempDir . '/' . $filenameParts['basename']);
     }
 
     /**

src/PhpSpreadsheet/Shared/ZipStreamWrapper.php

Doc Comments +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
      * @param int $offset byte offset
      * @param int $whence SEEK_SET, SEEK_CUR or SEEK_END
      *
-     * @return bool
+     * @return boolean|null
      */
     public function stream_seek($offset, $whence) // @codingStandardsIgnoreLine
     {

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
     {
         // Check for mode
         if ($mode{0} != 'r') {
-            throw new \PhpOffice\PhpSpreadsheet\Reader\Exception('Mode '.$mode.' is not supported. Only read mode is supported.');
+            throw new \PhpOffice\PhpSpreadsheet\Reader\Exception('Mode ' . $mode . ' is not supported. Only read mode is supported.');
         }
 
         $pos = strrpos($path, '#');

src/PhpSpreadsheet/Worksheet.php

Doc Comments +8 added lines, -8 removed lines

@@ -615,7 +615,7 @@ 
      *
      * @param string $index Chart index position
      * @throws Exception
-     * @return false|Chart
+     * @return null|Chart
      */
     public function getChartByIndex($index = null)
     {
@@ -1130,7 +1130,7 @@ 
      * Set a cell value
      *
      * @param string $pCoordinate Coordinate of the cell
-     * @param mixed $pValue Value of the cell
+     * @param integer $pValue Value of the cell
      * @param bool $returnCell   Return the worksheet (false, default) or the cell (true)
      * @return Worksheet|Cell    Depending on the last parameter being specified
      */
@@ -1241,8 +1241,8 @@ 
     /**
      * Get cell at a specific coordinate by using numeric cell coordinates
      *
-     * @param  string $pColumn Numeric column coordinate of the cell
-     * @param string $pRow Numeric row coordinate of the cell
+     * @param  integer $pColumn Numeric column coordinate of the cell
+     * @param integer $pRow Numeric row coordinate of the cell
      * @param bool $createIfNotExists  Flag indicating whether a new cell should be created if it doesn't
      *                                       already exist, or a null should be returned instead
      * @return null|Cell Cell that was found/created or null
@@ -1350,8 +1350,8 @@ 
     /**
      * Cell at a specific coordinate by using numeric cell coordinates exists?
      *
-     * @param string $pColumn Numeric column coordinate of the cell
-     * @param string $pRow Numeric row coordinate of the cell
+     * @param integer $pColumn Numeric column coordinate of the cell
+     * @param integer $pRow Numeric row coordinate of the cell
      * @return bool
      */
     public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1)
@@ -1968,7 +1968,7 @@ 
     /**
      *    Set AutoFilter
      *
-     *    @param    AutoFilter|string   $pValue
+     *    @param    string   $pValue
      *            A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
      *    @throws Exception
      *    @return Worksheet
@@ -2991,7 +2991,7 @@ 
      *
      * @param null|string Same rule as Title minus space not allowed (but, like Excel, change silently space to underscore)
      * @throws Exception
-     * @return objWorksheet
+     * @return Worksheet
      */
     public function setCodeName($pValue = null)
     {

src/PhpSpreadsheet/Writer/Xls/Parser.php

Doc Comments +9 added lines, -9 removed lines

@@ -507,7 +507,7 @@ 
      *
      * @param mixed $token The token to convert
      *
-     * @return mixed the converted token on success
+     * @return string the converted token on success
      */
     private function convert($token)
     {
@@ -577,7 +577,7 @@ 
      *
      * @param string $string A string for conversion to its ptg value
      *
-     * @return mixed the converted token on success
+     * @return string the converted token on success
      */
     private function convertString($string)
     {
@@ -656,7 +656,7 @@ 
      *
      * @param string $token An Excel range in the Sheet1!A1:A2 format
      *
-     * @return mixed The packed ptgArea3d token on success
+     * @return string The packed ptgArea3d token on success
      */
     private function convertRange3d($token)
     {
@@ -708,7 +708,7 @@ 
      *
      * @param string $cell An Excel cell reference
      *
-     * @return mixed The packed ptgRef3d token on success
+     * @return string The packed ptgRef3d token on success
      */
     private function convertRef3d($cell)
     {
@@ -807,7 +807,7 @@ 
      *
      * @param string $ext_ref The name of the external reference
      *
-     * @return mixed The reference index in packed() format on success
+     * @return string The reference index in packed() format on success
      */
     private function getRefIndex($ext_ref)
     {
@@ -898,7 +898,7 @@ 
      *
      * @param string $cell The Excel cell reference to be packed
      *
-     * @return array Array containing the row and column in packed() format
+     * @return string[] Array containing the row and column in packed() format
      */
     private function cellToPackedRowcol($cell)
     {
@@ -927,7 +927,7 @@ 
      *
      * @param string $range The Excel range to be packed
      *
-     * @return array Array containing (row1,col1,row2,col2) in packed() format
+     * @return string[] Array containing (row1,col1,row2,col2) in packed() format
      */
     private function rangeToPackedRange($range)
     {
@@ -1043,7 +1043,7 @@ 
     /**
      * Checks if it's a valid token.
      *
-     * @param mixed $token The token to check
+     * @param string $token The token to check
      *
      * @return mixed The checked token or false on failure
      */
@@ -1129,7 +1129,7 @@ 
      * @param string $formula The formula to parse, without the initial equal
      *                        sign (=)
      *
-     * @return mixed true on success
+     * @return boolean true on success
      */
     public function parse($formula)
     {

Spacing +21 added lines, -21 removed lines

@@ -519,19 +519,19 @@ 
         } elseif (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/', $token)) {
             return $this->convertRef2d($token);
         // match external references like Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1
-        } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u", $token)) {
+        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u", $token)) {
             return $this->convertRef3d($token);
         // match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1
-        } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED."(\:".self::REGEX_SHEET_TITLE_QUOTED.")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u", $token)) {
+        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u", $token)) {
             return $this->convertRef3d($token);
         // match ranges like A1:B2 or $A$1:$B$2
         } elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) {
             return $this->convertRange2d($token);
         // match external ranges like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
-        } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u", $token)) {
+        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u", $token)) {
             return $this->convertRange3d($token);
         // match external ranges like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
-        } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED."(\:".self::REGEX_SHEET_TITLE_QUOTED.")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u", $token)) {
+        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u", $token)) {
             return $this->convertRange3d($token);
         // operators (including parentheses)
         } elseif (isset($this->ptg[$token])) {
@@ -587,7 +587,7 @@ 
             throw new \PhpOffice\PhpSpreadsheet\Writer\WriteException('String is too long');
         }
 
-        return pack('C', $this->ptg['ptgStr']).\PhpOffice\PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeShort($string);
+        return pack('C', $this->ptg['ptgStr']) . \PhpOffice\PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeShort($string);
     }
 
     /**
@@ -647,7 +647,7 @@ 
             throw new \PhpOffice\PhpSpreadsheet\Writer\WriteException("Unknown class $class");
         }
 
-        return $ptgArea.$row1.$row2.$col1.$col2;
+        return $ptgArea . $row1 . $row2 . $col1 . $col2;
     }
 
     /**
@@ -674,13 +674,13 @@ 
             list($row1, $col1) = $this->cellToPackedRowcol($cell1);
             list($row2, $col2) = $this->cellToPackedRowcol($cell2);
         } else { // It's a rows range (like 26:27)
-            list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1.':'.$cell2);
+            list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1 . ':' . $cell2);
         }
 
         // The ptg value depends on the class of the ptg.
         $ptgArea = pack('C', $this->ptg['ptgArea3d']);
 
-        return $ptgArea.$ext_ref.$row1.$row2.$col1.$col2;
+        return $ptgArea . $ext_ref . $row1 . $row2 . $col1 . $col2;
     }
 
     /**
@@ -699,7 +699,7 @@ 
         // The ptg value depends on the class of the ptg.
         $ptgRef = pack('C', $this->ptg['ptgRefA']);
 
-        return $ptgRef.$row.$col;
+        return $ptgRef . $row . $col;
     }
 
     /**
@@ -724,7 +724,7 @@ 
         // The ptg value depends on the class of the ptg.
         $ptgRef = pack('C', $this->ptg['ptgRef3dA']);
 
-        return $ptgRef.$ext_ref.$row.$col;
+        return $ptgRef . $ext_ref . $row . $col;
     }
 
     /**
@@ -1086,22 +1086,22 @@ 
                 // if it's a reference A1 or $A$1 or $A1 or A$1
                 if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/', $token) and !preg_match('/[0-9]/', $this->lookAhead) and ($this->lookAhead != ':') and ($this->lookAhead != '.') and ($this->lookAhead != '!')) {
                     return $token;
-                } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $token) and !preg_match('/[0-9]/', $this->lookAhead) and ($this->lookAhead != ':') and ($this->lookAhead != '.')) {
+                } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $token) and !preg_match('/[0-9]/', $this->lookAhead) and ($this->lookAhead != ':') and ($this->lookAhead != '.')) {
                     // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
                     return $token;
-                } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED."(\:".self::REGEX_SHEET_TITLE_QUOTED.")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $token) and !preg_match('/[0-9]/', $this->lookAhead) and ($this->lookAhead != ':') and ($this->lookAhead != '.')) {
+                } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $token) and !preg_match('/[0-9]/', $this->lookAhead) and ($this->lookAhead != ':') and ($this->lookAhead != '.')) {
                     // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
                     return $token;
                 } elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/', $token) && !preg_match('/[0-9]/', $this->lookAhead)) {
                     // if it's a range A1:A2 or $A$1:$A$2
                     return $token;
-                } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?([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)) {
+                } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $token) and !preg_match('/[0-9]/', $this->lookAhead)) {
                     // If it's an external range like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
                     return $token;
-                } elseif (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)) {
+                } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $token) and !preg_match('/[0-9]/', $this->lookAhead)) {
                     // If it's an external range like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
                     return $token;
-                } elseif (is_numeric($token) and (!is_numeric($token.$this->lookAhead) or ($this->lookAhead == '')) and ($this->lookAhead != '!') and ($this->lookAhead != ':')) {
+                } elseif (is_numeric($token) and (!is_numeric($token . $this->lookAhead) or ($this->lookAhead == '')) and ($this->lookAhead != '!') and ($this->lookAhead != ':')) {
                     // If it's a number (check that it's not a sheet name or range)
                     return $token;
                 } elseif (preg_match('/"([^"]|""){0,255}"/', $token) and $this->lookAhead != '"' and (substr_count($token, '"') % 2 == 0)) {
@@ -1320,13 +1320,13 @@ 
             $this->advance();
 
             return $result;
-        } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $this->currentToken)) {
+        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $this->currentToken)) {
             // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
             $result = $this->createTree($this->currentToken, '', '');
             $this->advance();
 
             return $result;
-        } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED."(\:".self::REGEX_SHEET_TITLE_QUOTED.")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $this->currentToken)) {
+        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u", $this->currentToken)) {
             // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
             $result = $this->createTree($this->currentToken, '', '');
             $this->advance();
@@ -1340,14 +1340,14 @@ 
             $this->advance();
 
             return $result;
-        } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED."(\:".self::REGEX_SHEET_TITLE_UNQUOTED.")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $this->currentToken)) {
+        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u", $this->currentToken)) {
             // If it's an external range (Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2)
             // must be an error?
             $result = $this->createTree($this->currentToken, '', '');
             $this->advance();
 
             return $result;
-        } 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", $this->currentToken)) {
+        } 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", $this->currentToken)) {
             // If it's an external range ('Sheet1'!A1:B2 or 'Sheet1'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1'!$A$1:$B$2)
             // must be an error?
             $result = $this->createTree($this->currentToken, '', '');
@@ -1371,7 +1371,7 @@ 
 
             return $result;
         }
-        throw new \PhpOffice\PhpSpreadsheet\Writer\WriteException('Syntax error: '.$this->currentToken.', lookahead: '.$this->lookAhead.', current char: '.$this->currentCharacter);
+        throw new \PhpOffice\PhpSpreadsheet\Writer\WriteException('Syntax error: ' . $this->currentToken . ', lookahead: ' . $this->lookAhead . ', current char: ' . $this->currentCharacter);
     }
 
     /**
@@ -1492,7 +1492,7 @@ 
                 $left_tree = '';
             }
             // add it's left subtree and return.
-            return $left_tree.$this->convertFunction($tree['value'], $tree['right']);
+            return $left_tree . $this->convertFunction($tree['value'], $tree['right']);
         } else {
             $converted_tree = $this->convert($tree['value']);
         }

src/PhpSpreadsheet/Writer/Xls/Workbook.php

Doc Comments +2 added lines, -1 removed lines

@@ -242,6 +242,7 @@ 
      *
      * @param \PhpOffice\PhpSpreadsheet\Style
      * @param bool Is it a style XF?
+     * @param \PhpOffice\PhpSpreadsheet\Style $style
      *
      * @return int Index to XF record
      */
@@ -796,7 +797,7 @@ 
      *
      * @param string $name        The name in UTF-8
      * @param string $formulaData The binary formula data
-     * @param string $sheetIndex  1-based sheet index the defined name applies to. 0 = global
+     * @param integer $sheetIndex  1-based sheet index the defined name applies to. 0 = global
      * @param bool   $isBuiltIn   Built-in name?
      *
      * @return string Complete binary record data

Spacing +24 added lines, -24 removed lines

@@ -657,7 +657,7 @@ 
                 // Create absolute coordinate
                 $range = \PhpOffice\PhpSpreadsheet\Cell::splitRange($namedRange->getRange());
                 for ($i = 0; $i < count($range); ++$i) {
-                    $range[$i][0] = '\''.str_replace("'", "''", $namedRange->getWorksheet()->getTitle()).'\'!'.\PhpOffice\PhpSpreadsheet\Cell::absoluteCoordinate($range[$i][0]);
+                    $range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . \PhpOffice\PhpSpreadsheet\Cell::absoluteCoordinate($range[$i][0]);
                     if (isset($range[$i][1])) {
                         $range[$i][1] = \PhpOffice\PhpSpreadsheet\Cell::absoluteCoordinate($range[$i][1]);
                     }
@@ -671,7 +671,7 @@ 
 
                     // make sure tRef3d is of type tRef3dR (0x3A)
                     if (isset($formulaData{0}) and ($formulaData{0} == "\x7A" or $formulaData{0} == "\x5A")) {
-                        $formulaData = "\x3A".substr($formulaData, 1);
+                        $formulaData = "\x3A" . substr($formulaData, 1);
                     }
 
                     if ($namedRange->getLocalOnly()) {
@@ -819,12 +819,12 @@ 
 
         // combine the parts
         $data = pack('vCCvvvCCCC', $options, 0, $nlen, $sz, 0, $sheetIndex, 0, 0, 0, 0)
-            .$name.$formulaData;
+            .$name . $formulaData;
         $length = strlen($data);
 
         $header = pack('vv', $record, $length);
 
-        return $header.$data;
+        return $header . $data;
     }
 
     /**
@@ -859,12 +859,12 @@ 
 
         // combine the parts
         $data = pack('vCCvvvCCCCC', $options, 0, 1, $sz, 0, $sheetIndex, 0, 0, 0, 0, 0)
-            .$name.$extra;
+            .$name . $extra;
         $length = strlen($data);
 
         $header = pack('vv', $record, $length);
 
-        return $header.$data;
+        return $header . $data;
     }
 
     /**
@@ -879,7 +879,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', $cv);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -908,7 +908,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvvvvvvv', $xWn, $yWn, $dxWn, $dyWn, $grbit, $itabCur, $itabFirst, $ctabsel, $wTabRatio);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -948,7 +948,7 @@ 
 
         $length = strlen($data);
         $header = pack('vv', $record, $length);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -962,7 +962,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('vv', $this->spreadsheet->getSheetCount(), 0x0401);
 
-        return $this->writeData($header.$data);
+        return $this->writeData($header . $data);
     }
 
     /**
@@ -982,7 +982,7 @@ 
             $data .= $this->parser->references[$i];
         }
 
-        return $this->writeData($header.$data);
+        return $this->writeData($header . $data);
     }
 
     /**
@@ -999,7 +999,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vCC', $ixfe, $BuiltIn, $iLevel);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1016,8 +1016,8 @@ 
         $length = 2 + strlen($numberFormatString); // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
-        $data = pack('v', $ifmt).$numberFormatString;
-        $this->append($header.$data);
+        $data = pack('v', $ifmt) . $numberFormatString;
+        $this->append($header . $data);
     }
 
     /**
@@ -1034,7 +1034,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $f1904);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1056,7 +1056,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $cxals);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1078,7 +1078,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('CC', $cch, $rgch);
-        $this->append($header.$data.$sheetname);
+        $this->append($header . $data . $sheetname);
     }
 
     /**
@@ -1140,7 +1140,7 @@ 
         $data .= pack('v', $rowmax);
         $data .= pack('C', $colmin);
         $data .= pack('C', $colmax);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1223,7 +1223,7 @@ 
         $data .= pack('C', 0xff);
         // End of data
         $data .= pack('C', 0x10);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1240,7 +1240,7 @@ 
         /* using the same country code always for simplicity */
         $data = pack('vv', $this->countryCode, $this->countryCode);
 
-        return $this->writeData($header.$data);
+        return $this->writeData($header . $data);
     }
 
     /**
@@ -1258,7 +1258,7 @@ 
         // by inspection of real Excel files, MS Office Excel 2007 writes this
         $data = pack('VV', 0x000001C1, 0x00001E667);
 
-        return $this->writeData($header.$data);
+        return $this->writeData($header . $data);
     }
 
     /**
@@ -1281,7 +1281,7 @@ 
         }
 
         $header = pack('vvv', $record, $length, $ccv);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1401,7 +1401,7 @@ 
             $record = ($i == 0) ? 0x00FC : 0x003C;
 
             $header = pack('vv', $record, strlen($recordData));
-            $data = $header.$recordData;
+            $data = $header . $recordData;
 
             $chunk .= $this->writeData($data);
         }
@@ -1423,7 +1423,7 @@ 
             $length = strlen($data);
             $header = pack('vv', $record, $length);
 
-            return $this->writeData($header.$data);
+            return $this->writeData($header . $data);
         } else {
             return '';
         }

src/PhpSpreadsheet/Writer/Xls/Worksheet.php

Doc Comments +8 added lines, -6 removed lines

@@ -219,6 +219,8 @@ 
      * @param bool                                $preCalculateFormulas Flag indicating whether formulas should be calculated or just written
      * @param string                              $phpSheet             The worksheet to write
      * @param \PhpOffice\PhpSpreadsheet\Worksheet $phpSheet
+     * @param integer $str_total
+     * @param integer $str_unique
      */
     public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet)
     {
@@ -620,7 +622,7 @@ 
      * @param int   $row     Zero indexed row
      * @param int   $col     Zero indexed column
      * @param float $num     The number to write
-     * @param mixed $xfIndex The optional XF format
+     * @param integer $xfIndex The optional XF format
      *
      * @return int
      */
@@ -729,7 +731,7 @@ 
      * @param int    $row     Zero indexed row
      * @param int    $col     Zero indexed column
      * @param string $str     The string to write
-     * @param mixed  $xfIndex The XF format index for the cell
+     * @param integer  $xfIndex The XF format index for the cell
      *
      * @return int
      */
@@ -796,7 +798,7 @@ 
      *
      * @param int   $row     Zero indexed row
      * @param int   $col     Zero indexed column
-     * @param mixed $xfIndex The XF format index
+     * @param integer $xfIndex The XF format index
      */
     public function writeBlank($row, $col, $xfIndex)
     {
@@ -843,7 +845,7 @@ 
      * @param int    $row             Zero indexed row
      * @param int    $col             Zero indexed column
      * @param string $formula         The formula text string
-     * @param mixed  $xfIndex         The XF format index
+     * @param integer  $xfIndex         The XF format index
      * @param mixed  $calculatedValue Calculated value
      *
      * @return int
@@ -2323,8 +2325,8 @@ 
      * @param mixed $bitmap  The bitmap filename or GD-image resource
      * @param int   $x       The horizontal position (offset) of the image inside the cell
      * @param int   $y       The vertical position (offset) of the image inside the cell
-     * @param float $scale_x The horizontal scale
-     * @param float $scale_y The vertical scale
+     * @param integer $scale_x The horizontal scale
+     * @param integer $scale_y The vertical scale
      */
     public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1)
     {

Indentation +8 added lines, -8 removed lines

@@ -1171,14 +1171,14 @@
 
         // 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; /*.
+                            $unknown1.
+                            $link_type.
+                            $unknown2.
+                            $up_count.
+                            $dir_short_len.
+                            $dir_short.
+                            $unknown3.
+                            $stream_len; /*.
                           $dir_long_len .
                           $unknown4     .
                           $dir_long     .

Spacing +75 added lines, -75 removed lines

@@ -490,7 +490,7 @@ 
                 // URL
             } else {
                 // external (local file)
-                $url = 'external:'.$url;
+                $url = 'external:' . $url;
             }
 
             $this->writeUrl($row - 1, \PhpOffice\PhpSpreadsheet\Cell::columnIndexFromString($column) - 1, $url);
@@ -636,7 +636,7 @@ 
             $xl_double = strrev($xl_double);
         }
 
-        $this->append($header.$data.$xl_double);
+        $this->append($header . $data . $xl_double);
 
         return 0;
     }
@@ -678,7 +678,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -713,7 +713,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvv', $row, $col, $xfIndex, $strlen);
-        $this->append($header.$data.$str);
+        $this->append($header . $data . $str);
 
         return $str_error;
     }
@@ -748,7 +748,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -769,14 +769,14 @@ 
         $length = 0x0006 + min($note_length, 2048);
         $header = pack('vv', $record, $length);
         $data = pack('vvv', $row, $col, $note_length);
-        $this->append($header.$data.substr($note, 0, 2048));
+        $this->append($header . $data . substr($note, 0, 2048));
 
         for ($i = $max_length; $i < $note_length; $i += $max_length) {
             $chunk = substr($note, $i, $max_length);
             $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;
@@ -805,7 +805,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvv', $row, $col, $xfIndex);
-        $this->append($header.$data);
+        $this->append($header . $data);
 
         return 0;
     }
@@ -826,7 +826,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvCC', $row, $col, $xfIndex, $value, $isError);
-        $this->append($header.$data);
+        $this->append($header . $data);
 
         return 0;
     }
@@ -912,7 +912,7 @@ 
             $data = pack('vvv', $row, $col, $xfIndex)
                         .$num
                         .pack('vVv', $grbit, $unknown, $formlen);
-            $this->append($header.$data.$formula);
+            $this->append($header . $data . $formula);
 
             // Append also a STRING record if necessary
             if ($stringValue !== null) {
@@ -938,7 +938,7 @@ 
         $length = strlen($data);
         $header = pack('vv', $record, $length);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1026,7 +1026,7 @@ 
 
         // Convert URL to a null terminated wchar string
         $url = implode("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
-        $url = $url."\0\0\0";
+        $url = $url . "\0\0\0";
 
         // Pack the length of the URL
         $url_len = pack('V', strlen($url));
@@ -1039,7 +1039,7 @@ 
         $data = pack('vvvv', $row1, $row2, $col1, $col2);
 
         // Write the packed data
-        $this->append($header.$data.$unknown1.$options.$unknown2.$url_len.$url);
+        $this->append($header . $data . $unknown1 . $options . $unknown2 . $url_len . $url);
 
         return 0;
     }
@@ -1088,7 +1088,7 @@ 
         $data = pack('vvvv', $row1, $row2, $col1, $col2);
 
         // Write the packed data
-        $this->append($header.$data.$unknown1.$options.$url_len.$url);
+        $this->append($header . $data . $unknown1 . $options . $url_len . $url);
 
         return 0;
     }
@@ -1153,10 +1153,10 @@ 
         $up_count = pack('v', $up_count);
 
         // Store the short dos dir name (null terminated)
-        $dir_short = preg_replace("/\.\.\\\/", '', $dir_long)."\0";
+        $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));
@@ -1170,14 +1170,14 @@ 
         $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.
+        $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     .
@@ -1190,7 +1190,7 @@ 
         $header = pack('vv', $record, $length);
 
         // Write the packed data
-        $this->append($header.$data);
+        $this->append($header . $data);
 
         return 0;
     }
@@ -1248,7 +1248,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvvvvvv', $row, $colMic, $colMac, $miyRw, $irwMac, $reserved, $grbit, $ixfe);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1262,7 +1262,7 @@ 
         $data = pack('VVvvv', $this->firstRowIndex, $this->lastRowIndex + 1, $this->firstColumnIndex, $this->lastColumnIndex + 1, 0x0000); // reserved
 
         $header = pack('vv', $record, $length);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1315,7 +1315,7 @@ 
 
         $data .= pack('vvvvV', $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1337,7 +1337,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vv', 1, $defaultRowHeight);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1352,7 +1352,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $defaultColWidth);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1410,7 +1410,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvvvv', $colFirst, $colLast, $coldx, $ixfe, $grbit, $reserved);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1471,7 +1471,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('CvvvvvvCC', $pnn, $rwAct, $colAct, $irefAct, $cref, $rwFirst, $rwLast, $colFirst, $colLast);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1516,10 +1516,10 @@ 
 
             // flush record if we have reached limit for number of merged cells, or reached final merged cell
             if ($j == $maxCountMergeCellsPerRecord or $i == $countMergeCells) {
-                $recordData = pack('v', $j).$recordData;
+                $recordData = pack('v', $j) . $recordData;
                 $length = strlen($recordData);
                 $header = pack('vv', $record, $length);
-                $this->append($header.$recordData);
+                $this->append($header . $recordData);
 
                 // initialize for next record, if any
                 $recordData = '';
@@ -1552,7 +1552,7 @@ 
 
         $record = 0x0862; // Record identifier
         $header = pack('vv', $record, $length);
-        $this->append($header.$recordData);
+        $this->append($header . $recordData);
     }
 
     /**
@@ -1596,7 +1596,7 @@ 
         $length = strlen($recordData);
         $header = pack('vv', $record, $length);
 
-        $this->append($header.$recordData);
+        $this->append($header . $recordData);
     }
 
     /**
@@ -1637,13 +1637,13 @@ 
                 hexdec($password)
             );
 
-            $recordData .= \PhpOffice\PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeLong('p'.md5($recordData));
+            $recordData .= \PhpOffice\PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeLong('p' . md5($recordData));
 
             $length = strlen($recordData);
 
             $record = 0x0868; // Record identifier
             $header = pack('vv', $record, $length);
-            $this->append($header.$recordData);
+            $this->append($header . $recordData);
         }
     }
 
@@ -1666,7 +1666,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $count);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1697,7 +1697,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('CC', $cch, $rgch);
-        $this->append($header.$data.$sheetname);
+        $this->append($header . $data . $sheetname);
     }
 
     /**
@@ -1779,7 +1779,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvvv', $x, $y, $rwTop, $colLeft, $pnnAct);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1838,9 +1838,9 @@ 
 
         $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);
+        $this->append($header . $data1 . $data2 . $data3);
     }
 
     /**
@@ -1864,7 +1864,7 @@ 
 
         $header = pack('vv', $record, $length);
 
-        $this->append($header.$recordData);
+        $this->append($header . $recordData);
     }
 
     /**
@@ -1888,7 +1888,7 @@ 
 
         $header = pack('vv', $record, $length);
 
-        $this->append($header.$recordData);
+        $this->append($header . $recordData);
     }
 
     /**
@@ -1904,7 +1904,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fHCenter);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1919,7 +1919,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fVCenter);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1938,7 +1938,7 @@ 
             $data = strrev($data);
         }
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1957,7 +1957,7 @@ 
             $data = strrev($data);
         }
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1976,7 +1976,7 @@ 
             $data = strrev($data);
         }
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -1995,7 +1995,7 @@ 
             $data = strrev($data);
         }
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2010,7 +2010,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fPrintRwCol);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2026,7 +2026,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fPrintGrid);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2042,7 +2042,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fGridSet);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2058,7 +2058,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $iNumFilters);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2105,7 +2105,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('vvvv', $dxRwGut, $dxColGut, $maxRowOutlineLevel, $col_level);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2141,7 +2141,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $grbit);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2194,7 +2194,7 @@ 
                 $data .= pack('vvv', $hbreak, 0x0000, 0x00ff);
             }
 
-            $this->append($header.$data);
+            $this->append($header . $data);
         }
 
         // vertical page breaks
@@ -2221,7 +2221,7 @@ 
                 $data .= pack('vvv', $vbreak, 0x0000, 0xffff);
             }
 
-            $this->append($header.$data);
+            $this->append($header . $data);
         }
     }
 
@@ -2243,7 +2243,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fLock);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2267,7 +2267,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', 1);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2291,7 +2291,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', 1);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2312,7 +2312,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', $wPassword);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2346,7 +2346,7 @@ 
         $lcb = $size;
 
         $header = pack('vvvvV', $record, $length, $cf, $env, $lcb);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2528,7 +2528,7 @@ 
         $data .= pack('v', $grbit2);
         $data .= pack('V', $Reserved5);
 
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2550,7 +2550,7 @@ 
                 foreach (['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']);
+                $data .= chr($color['blue']) . chr($color['green']) . chr($color['red']);
             }
             if (3 * $width % 4) {
                 $data .= str_repeat("\x00", 4 - 3 * $width % 4);
@@ -2641,7 +2641,7 @@ 
 
         // Add the BITMAPCOREHEADER data
         $header = pack('Vvvvv', 0x000c, $width, $height, 0x01, 0x18);
-        $data = $header.$data;
+        $data = $header . $data;
 
         return [$width, $height, $size, $data];
     }
@@ -2662,7 +2662,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vv', $this->phpSheet->getSheetView()->getZoomScale(), 100);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -2711,7 +2711,7 @@ 
                 $length = strlen($dataChunk);
                 $header = pack('vv', $record, $length);
 
-                $this->append($header.$dataChunk);
+                $this->append($header . $dataChunk);
 
                 // OBJ record
                 $record = 0x005D; // record identifier
@@ -2765,7 +2765,7 @@ 
 
                 $length = strlen($objData);
                 $header = pack('vv', $record, $length);
-                $this->append($header.$objData);
+                $this->append($header . $objData);
             }
         }
     }
@@ -2791,7 +2791,7 @@ 
 
             $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
@@ -2956,7 +2956,7 @@ 
                 $length = strlen($data);
                 $header = pack('vv', $record, $length);
 
-                $this->append($header.$data);
+                $this->append($header . $data);
             }
         }
     }
@@ -3018,7 +3018,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vvVVvv', $rt, $grbitFrt, 0x00000000, 0x00000000, $wScalvePLV, $grbit);
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -4196,7 +4196,7 @@ 
             $data .= $operand2;
         }
         $header = pack('vv', $record, strlen($data));
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 
     /**
@@ -4247,6 +4247,6 @@ 
         $data .= $cellRange;
         $data .= pack('v', 0x0001);
         $data .= $cellRange;
-        $this->append($header.$data);
+        $this->append($header . $data);
     }
 }

src/PhpSpreadsheet/CachedObjectStorage/Memcache.php

Spacing +11 added lines, -11 removed lines

@@ -61,8 +61,8 @@ 
             $this->currentObject->detach();
 
             $obj = serialize($this->currentObject);
-            if (!$this->memcache->replace($this->cachePrefix.$this->currentObjectID.'.cache', $obj, null, $this->cacheTime)) {
-                if (!$this->memcache->add($this->cachePrefix.$this->currentObjectID.'.cache', $obj, null, $this->cacheTime)) {
+            if (!$this->memcache->replace($this->cachePrefix . $this->currentObjectID . '.cache', $obj, null, $this->cacheTime)) {
+                if (!$this->memcache->add($this->cachePrefix . $this->currentObjectID . '.cache', $obj, null, $this->cacheTime)) {
                     $this->__destruct();
                     throw new \PhpOffice\PhpSpreadsheet\Exception("Failed to store cell {$this->currentObjectID} in MemCache");
                 }
@@ -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 \PhpOffice\PhpSpreadsheet\Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
+                throw new \PhpOffice\PhpSpreadsheet\Exception('Cell entry ' . $pCoord . ' no longer exists in MemCache');
             }
 
             return true;
@@ -144,7 +144,7 @@ 
 
         //    Check if the entry that has been requested actually exists
         if (parent::isDataSet($pCoord)) {
-            $obj = $this->memcache->get($this->cachePrefix.$pCoord.'.cache');
+            $obj = $this->memcache->get($this->cachePrefix . $pCoord . '.cache');
             if ($obj === false) {
                 //    Entry no longer exists in Memcache, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
@@ -189,7 +189,7 @@ 
     public function deleteCacheData($pCoord)
     {
         //    Delete the entry from Memcache
-        $this->memcache->delete($this->cachePrefix.$pCoord.'.cache');
+        $this->memcache->delete($this->cachePrefix . $pCoord . '.cache');
 
         //    Delete the entry from our cell address array
         parent::deleteCacheData($pCoord);
@@ -207,17 +207,17 @@ 
         parent::copyCellCollection($parent);
         //    Get a new id for the new file name
         $baseUnique = $this->getUniqueID();
-        $newCachePrefix = substr(md5($baseUnique), 0, 8).'.';
+        $newCachePrefix = substr(md5($baseUnique), 0, 8) . '.';
         $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);
                     throw new \PhpOffice\PhpSpreadsheet\Exception("Cell entry {$cellID} no longer exists in MemCache");
                 }
-                if (!$this->memcache->add($newCachePrefix.$cellID.'.cache', $obj, null, $this->cacheTime)) {
+                if (!$this->memcache->add($newCachePrefix . $cellID . '.cache', $obj, null, $this->cacheTime)) {
                     $this->__destruct();
                     throw new \PhpOffice\PhpSpreadsheet\Exception("Failed to store cell {$cellID} in MemCache");
                 }
@@ -261,7 +261,7 @@ 
 
         if (is_null($this->cachePrefix)) {
             $baseUnique = $this->getUniqueID();
-            $this->cachePrefix = substr(md5($baseUnique), 0, 8).'.';
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8) . '.';
 
             //    Set a new Memcache object and connect to the Memcache server
             $this->memcache = new \Memcache();
@@ -294,7 +294,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/PHPTemp.php

Spacing +2 added lines, -2 removed lines

@@ -143,7 +143,7 @@ 
     {
         parent::copyCellCollection($parent);
         //    Open a new stream for the cell cache data
-        $newFileHandle = fopen('php://temp/maxmemory:'.$this->memoryCacheSize, 'a+');
+        $newFileHandle = fopen('php://temp/maxmemory:' . $this->memoryCacheSize, 'a+');
         //    Copy the existing cell cache data to the new stream
         fseek($this->fileHandle, 0);
         while (!feof($this->fileHandle)) {
@@ -182,7 +182,7 @@ 
 
         parent::__construct($parent);
         if (is_null($this->fileHandle)) {
-            $this->fileHandle = fopen('php://temp/maxmemory:'.$this->memoryCacheSize, 'a+');
+            $this->fileHandle = fopen('php://temp/maxmemory:' . $this->memoryCacheSize, 'a+');
         }
     }