PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Shared/Font.php

Doc Comments +1 added lines, -1 removed lines

@@ -238,7 +238,7 @@
      * Calculate an (approximate) OpenXML column width, based on font size and text contained.
      *
      * @param \PhpOffice\PhpSpreadsheet\Style\Font      $font        Font object
-     * @param \PhpOffice\PhpSpreadsheet\RichText|string $cellText    Text to calculate width
+     * @param string $cellText    Text to calculate width
      * @param int                                       $rotation    Rotation angle
      * @param \PhpOffice\PhpSpreadsheet\Style\Font|null $defaultFont Font object
      *

Spacing +2 added lines, -2 removed lines

@@ -515,11 +515,11 @@
                 );
                 break;
             default:
-                throw new \PhpOffice\PhpSpreadsheet\Exception('Unknown font name "'.$name.'". Cannot map to TrueType font file');
+                throw new \PhpOffice\PhpSpreadsheet\Exception('Unknown font name "' . $name . '". Cannot map to TrueType font file');
                 break;
         }
 
-        $fontFile = self::$trueTypeFontPath.$fontFile;
+        $fontFile = self::$trueTypeFontPath . $fontFile;
 
         // Check if file actually exists
         if (!file_exists($fontFile)) {

src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php

Doc Comments +1 added lines, -1 removed lines

@@ -228,7 +228,7 @@
     /**
      *    Solve A*X = B.
      *
-     *    @param  $B  A Matrix with as many rows as A and any number of columns
+     *    @param  Matrix $B  A Matrix with as many rows as A and any number of columns
      *
      *    @throws \PhpOffice\PhpSpreadsheet\Calculation\Exception  IllegalArgumentException Matrix row dimensions must agree
      *    @throws \PhpOffice\PhpSpreadsheet\Calculation\Exception  RuntimeException  Matrix is singular

src/PhpSpreadsheet/Shared/JAMA/Matrix.php

Doc Comments +2 added lines, -47 removed lines

@@ -149,12 +149,6 @@ 
      *
      *    Get a submatrix
      *
-     *    @param int $i0 Initial row index
-     *    @param int $iF Final row index
-     *    @param int $j0 Initial column index
-     *    @param int $jF Final column index
-     *
-     *    @return Matrix Submatrix
      */
     public function getMatrix()
     {
@@ -365,7 +359,7 @@ 
      *
      *    @param int $m Row dimension
      *    @param int $n Column dimension
-     *    @param mixed $c Diagonal value
+     *    @param integer $c Diagonal value
      *
      *    @return Matrix Diagonal matrix
      */
@@ -449,7 +443,7 @@ 
      *
      *    Sum of diagonal elements
      *
-     *    @return float Sum of diagonal elements
+     *    @return integer Sum of diagonal elements
      */
     public function trace()
     {
@@ -478,9 +472,6 @@ 
      *
      *    A + B
      *
-     *    @param mixed $B Matrix/Array
-     *
-     *    @return Matrix Sum
      */
     public function plus()
     {
@@ -521,9 +512,6 @@ 
      *
      *    A = A + B
      *
-     *    @param mixed $B Matrix/Array
-     *
-     *    @return Matrix Sum
      */
     public function plusEquals()
     {
@@ -578,9 +566,6 @@ 
      *
      *    A - B
      *
-     *    @param mixed $B Matrix/Array
-     *
-     *    @return Matrix Sum
      */
     public function minus()
     {
@@ -621,9 +606,6 @@ 
      *
      *    A = A - B
      *
-     *    @param mixed $B Matrix/Array
-     *
-     *    @return Matrix Sum
      */
     public function minusEquals()
     {
@@ -679,9 +661,6 @@ 
      *    Element-by-element multiplication
      *    Cij = Aij * Bij
      *
-     *    @param mixed $B Matrix/Array
-     *
-     *    @return Matrix Matrix Cij
      */
     public function arrayTimes()
     {
@@ -723,9 +702,6 @@ 
      *    Element-by-element multiplication
      *    Aij = Aij * Bij
      *
-     *    @param mixed $B Matrix/Array
-     *
-     *    @return Matrix Matrix Aij
      */
     public function arrayTimesEquals()
     {
@@ -781,9 +757,6 @@ 
      *    Element-by-element right division
      *    A / B
      *
-     *    @param Matrix $B Matrix B
-     *
-     *    @return Matrix Division result
      */
     public function arrayRightDivide()
     {
@@ -844,9 +817,6 @@ 
      *    Element-by-element right division
      *    Aij = Aij / Bij
      *
-     *    @param mixed $B Matrix/Array
-     *
-     *    @return Matrix Matrix Aij
      */
     public function arrayRightDivideEquals()
     {
@@ -888,9 +858,6 @@ 
      *    Element-by-element Left division
      *    A / B
      *
-     *    @param Matrix $B Matrix B
-     *
-     *    @return Matrix Division result
      */
     public function arrayLeftDivide()
     {
@@ -932,9 +899,6 @@ 
      *    Element-by-element Left division
      *    Aij = Aij / Bij
      *
-     *    @param mixed $B Matrix/Array
-     *
-     *    @return Matrix Matrix Aij
      */
     public function arrayLeftDivideEquals()
     {
@@ -975,9 +939,6 @@ 
      *
      *    Matrix multiplication
      *
-     *    @param mixed $n Matrix/Array/Scalar
-     *
-     *    @return Matrix Product
      */
     public function times()
     {
@@ -1078,9 +1039,6 @@ 
      *
      *    A = A ^ B
      *
-     *    @param mixed $B Matrix/Array
-     *
-     *    @return Matrix Sum
      */
     public function power()
     {
@@ -1135,9 +1093,6 @@ 
      *
      *    A = A & B
      *
-     *    @param mixed $B Matrix/Array
-     *
-     *    @return Matrix Sum
      */
     public function concat()
     {

Spacing +1 added lines, -1 removed lines

@@ -1163,7 +1163,7 @@
             $this->checkMatrixDimensions($M);
             for ($i = 0; $i < $this->m; ++$i) {
                 for ($j = 0; $j < $this->n; ++$j) {
-                    $this->A[$i][$j] = trim($this->A[$i][$j], '"').trim($M->get($i, $j), '"');
+                    $this->A[$i][$j] = trim($this->A[$i][$j], '"') . trim($M->get($i, $j), '"');
                 }
             }
 

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 '';
         }