Dolibarr / dolibarr

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         $slope = $this->getSlope($dp);
         $intersect = $this->getIntersect($dp);
 
-        return 'Y = ' . $intersect . ' * ' . $slope . '^X';
+        return 'Y = '.$intersect.' * '.$slope.'^X';
     }
 
     /**

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
             trigger_error('Trend(): Number of elements in coordinate arrays do not match.', E_USER_ERROR);
         }
 
-        $key = md5($trendType . $const . serialize($yValues) . serialize($xValues));
+        $key = md5($trendType.$const.serialize($yValues).serialize($xValues));
         //    Determine which Trend method has been requested
         switch ($trendType) {
             //    Instantiate and return the class for the requested Trend method
@@ -72,7 +72,7 @@ 
             case self::TREND_EXPONENTIAL:
             case self::TREND_POWER:
                 if (!isset(self::$trendCache[$key])) {
-                    $className = '\PhpOffice\PhpSpreadsheet\Shared\Trend\\' . $trendType . 'BestFit';
+                    $className = '\PhpOffice\PhpSpreadsheet\Shared\Trend\\'.$trendType.'BestFit';
                     self::$trendCache[$key] = new $className($yValues, $xValues, $const);
                 }
 
@@ -93,7 +93,7 @@ 
                 //    If the request is to determine the best fit regression, then we test each Trend line in turn
                 //    Start by generating an instance of each available Trend method
                 foreach (self::$trendTypes as $trendMethod) {
-                    $className = '\PhpOffice\PhpSpreadsheet\Shared\Trend\\' . $trendType . 'BestFit';
+                    $className = '\PhpOffice\PhpSpreadsheet\Shared\Trend\\'.$trendType.'BestFit';
                     $bestFit[$trendMethod] = new $className($yValues, $xValues, $const);
                     $bestFitValue[$trendMethod] = $bestFit[$trendMethod]->getGoodnessOfFit();
                 }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php

Spacing +1 added lines, -1 removed lines

@@ -258,7 +258,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

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php

Spacing +2 added lines, -2 removed lines

@@ -266,8 +266,8 @@
         $x2 = ($width + 1) / self::sizeCol($sheet, Coordinate::stringFromColumnIndex($col_end)) * 1024; // Distance to right side of object
         $y2 = ($height + 1) / self::sizeRow($sheet, $row_end + 1) * 256; // Distance to bottom of object
 
-        $startCoordinates = Coordinate::stringFromColumnIndex($col_start) . ($row_start + 1);
-        $endCoordinates = Coordinate::stringFromColumnIndex($col_end) . ($row_end + 1);
+        $startCoordinates = Coordinate::stringFromColumnIndex($col_start).($row_start + 1);
+        $endCoordinates = Coordinate::stringFromColumnIndex($col_end).($row_end + 1);
 
         return [
             'startCoordinates' => $startCoordinates,

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php

Spacing +4 added lines, -4 removed lines

@@ -108,7 +108,7 @@ 
         // Check OLE identifier
         $identifierOle = pack('CCCCCCCC', 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1);
         if ($this->data != $identifierOle) {
-            throw new ReaderException('The filename ' . $pFilename . ' is not recognised as an OLE file');
+            throw new ReaderException('The filename '.$pFilename.' is not recognised as an OLE file');
         }
 
         // Get the file data
@@ -303,12 +303,12 @@ 
             }
 
             // Summary information
-            if ($name == chr(5) . 'SummaryInformation') {
+            if ($name == chr(5).'SummaryInformation') {
                 $this->summaryInformation = count($this->props) - 1;
             }
 
             // Additional Document Summary information
-            if ($name == chr(5) . 'DocumentSummaryInformation') {
+            if ($name == chr(5).'DocumentSummaryInformation') {
                 $this->documentSummaryInformation = count($this->props) - 1;
             }
 
@@ -328,7 +328,7 @@ 
     {
         if ($pos < 0) {
             // Invalid position
-            throw new ReaderException('Parameter pos=' . $pos . ' is invalid.');
+            throw new ReaderException('Parameter pos='.$pos.' is invalid.');
         }
 
         $len = strlen($data);

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php

Spacing +2 added lines, -2 removed lines

@@ -506,12 +506,12 @@
 
                 break;
             default:
-                throw new PhpSpreadsheetException('Unknown font name "' . $name . '". Cannot map to TrueType font file');
+                throw new PhpSpreadsheetException('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)) {

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php

Spacing +20 added lines, -20 removed lines

@@ -541,7 +541,7 @@ 
                 $range = Coordinate::splitRange($namedRange->getRange());
                 $iMax = count($range);
                 for ($i = 0; $i < $iMax; ++$i) {
-                    $range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . Coordinate::absoluteCoordinate($range[$i][0]);
+                    $range[$i][0] = '\''.str_replace("'", "''", $namedRange->getWorksheet()->getTitle()).'\'!'.Coordinate::absoluteCoordinate($range[$i][0]);
                     if (isset($range[$i][1])) {
                         $range[$i][1] = Coordinate::absoluteCoordinate($range[$i][1]);
                     }
@@ -555,7 +555,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()) {
@@ -703,12 +703,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;
     }
 
     /**
@@ -743,12 +743,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;
     }
 
     /**
@@ -763,7 +763,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('v', $cv);
 
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -792,7 +792,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);
     }
 
     /**
@@ -836,7 +836,7 @@ 
 
         $length = strlen($data);
         $header = pack('vv', $record, $length);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -850,7 +850,7 @@ 
         $header = pack('vv', $record, $length);
         $data = pack('vv', $this->spreadsheet->getSheetCount(), 0x0401);
 
-        return $this->writeData($header . $data);
+        return $this->writeData($header.$data);
     }
 
     /**
@@ -870,7 +870,7 @@ 
             $data .= $this->parser->references[$i];
         }
 
-        return $this->writeData($header . $data);
+        return $this->writeData($header.$data);
     }
 
     /**
@@ -887,7 +887,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('vCC', $ixfe, $BuiltIn, $iLevel);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -904,8 +904,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);
     }
 
     /**
@@ -922,7 +922,7 @@ 
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $f1904);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -939,7 +939,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);
     }
 
     /**
@@ -957,7 +957,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);
     }
 
     /**
@@ -980,7 +980,7 @@ 
         }
 
         $header = pack('vvv', $record, $length, $ccv);
-        $this->append($header . $data);
+        $this->append($header.$data);
     }
 
     /**
@@ -1100,7 +1100,7 @@ 
             $record = ($i == 0) ? 0x00FC : 0x003C;
 
             $header = pack('vv', $record, strlen($recordData));
-            $data = $header . $recordData;
+            $data = $header.$recordData;
 
             $chunk .= $this->writeData($data);
         }
@@ -1122,7 +1122,7 @@ 
             $length = strlen($data);
             $header = pack('vv', $record, $length);
 
-            return $this->writeData($header . $data);
+            return $this->writeData($header.$data);
         }
 
         return '';

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php

Spacing +12 added lines, -12 removed lines

@@ -102,7 +102,7 @@ 
                 }
 
                 $header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
-                $innerData .= $header . $dggData;
+                $innerData .= $header.$dggData;
 
                 // write the bstoreContainer
                 if ($bstoreContainer = $this->object->getBstoreContainer()) {
@@ -121,7 +121,7 @@ 
 
                 $header = pack('vvV', $recVerInstance, $recType, $length);
 
-                $this->data = $header . $innerData;
+                $this->data = $header.$innerData;
 
                 break;
             case BstoreContainer::class:
@@ -149,7 +149,7 @@ 
 
                 $header = pack('vvV', $recVerInstance, $recType, $length);
 
-                $this->data = $header . $innerData;
+                $this->data = $header.$innerData;
 
                 break;
             case BSE::class:
@@ -283,7 +283,7 @@ 
 
                 // number of shapes in this drawing (including group shape)
                 $countShapes = count($this->object->getSpgrContainer()->getChildren());
-                $innerData .= $header . pack('VV', $countShapes, $this->object->getLastSpId());
+                $innerData .= $header.pack('VV', $countShapes, $this->object->getLastSpId());
 
                 // write the spgrContainer
                 if ($spgrContainer = $this->object->getSpgrContainer()) {
@@ -314,7 +314,7 @@ 
 
                 $header = pack('vvV', $recVerInstance, $recType, $length);
 
-                $this->data = $header . $innerData;
+                $this->data = $header.$innerData;
 
                 break;
             case SpgrContainer::class:
@@ -352,7 +352,7 @@ 
 
                 $header = pack('vvV', $recVerInstance, $recType, $length);
 
-                $this->data = $header . $innerData;
+                $this->data = $header.$innerData;
                 $this->spOffsets = $spOffsets;
                 $this->spTypes = $spTypes;
 
@@ -375,7 +375,7 @@ 
 
                     $header = pack('vvV', $recVerInstance, $recType, $length);
 
-                    $data .= $header . pack('VVVV', 0, 0, 0, 0);
+                    $data .= $header.pack('VVVV', 0, 0, 0, 0);
                 }
                 $this->spTypes[] = ($this->object->getSpType());
 
@@ -390,7 +390,7 @@ 
 
                 $header = pack('vvV', $recVerInstance, $recType, $length);
 
-                $data .= $header . pack('VV', $this->object->getSpId(), $this->object->getSpgr() ? 0x0005 : 0x0A00);
+                $data .= $header.pack('VV', $this->object->getSpId(), $this->object->getSpgr() ? 0x0005 : 0x0A00);
 
                 // the options
                 if ($this->object->getOPTCollection()) {
@@ -408,7 +408,7 @@ 
                     $recVerInstance |= $recInstance << 4;
 
                     $header = pack('vvV', $recVerInstance, $recType, $length);
-                    $data .= $header . $optData;
+                    $data .= $header.$optData;
                 }
 
                 // the client anchor
@@ -449,7 +449,7 @@ 
                     $recVerInstance |= $recInstance << 4;
 
                     $header = pack('vvV', $recVerInstance, $recType, $length);
-                    $data .= $header . $clientAnchorData;
+                    $data .= $header.$clientAnchorData;
                 }
 
                 // the client data, just empty for now
@@ -466,7 +466,7 @@ 
                     $recVerInstance |= $recInstance << 4;
 
                     $header = pack('vvV', $recVerInstance, $recType, $length);
-                    $data .= $header . $clientDataData;
+                    $data .= $header.$clientDataData;
                 }
 
                 // write the record
@@ -480,7 +480,7 @@ 
 
                 $header = pack('vvV', $recVerInstance, $recType, $length);
 
-                $this->data = $header . $data;
+                $this->data = $header.$data;
 
                 break;
         }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php

Spacing +22 added lines, -22 removed lines

@@ -498,19 +498,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])) {
@@ -569,7 +569,7 @@ 
             throw new WriterException('String is too long');
         }
 
-        return pack('C', $this->ptg['ptgStr']) . StringHelper::UTF8toBIFF8UnicodeShort($string);
+        return pack('C', $this->ptg['ptgStr']).StringHelper::UTF8toBIFF8UnicodeShort($string);
     }
 
     /**
@@ -630,7 +630,7 @@ 
             throw new WriterException("Unknown class $class");
         }
 
-        return $ptgArea . $row1 . $row2 . $col1 . $col2;
+        return $ptgArea.$row1.$row2.$col1.$col2;
     }
 
     /**
@@ -657,13 +657,13 @@ 
             [$row1, $col1] = $this->cellToPackedRowcol($cell1);
             [$row2, $col2] = $this->cellToPackedRowcol($cell2);
         } else { // It's a rows range (like 26:27)
-            [$row1, $col1, $row2, $col2] = $this->rangeToPackedRange($cell1 . ':' . $cell2);
+            [$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;
     }
 
     /**
@@ -682,7 +682,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;
     }
 
     /**
@@ -707,7 +707,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;
     }
 
     /**
@@ -1029,22 +1029,22 @@ 
                 // if it's a reference A1 or $A$1 or $A1 or A$1
                 if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $token) and !preg_match('/\d/', $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]\$?\\d+$/u', $token) and !preg_match('/\d/', $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]\$?\\d+$/u', $token) and !preg_match('/\d/', $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]\\$?\\d+$/u", $token) and !preg_match('/\d/', $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]\\$?\\d+$/u", $token) and !preg_match('/\d/', $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](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $token) && !preg_match('/\d/', $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])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $token) and !preg_match('/\d/', $this->lookAhead)) {
+                } 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) and !preg_match('/\d/', $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])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $token) and !preg_match('/\d/', $this->lookAhead)) {
+                } 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) and !preg_match('/\d/', $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)) {
@@ -1258,13 +1258,13 @@ 
             $this->advance();
 
             return $result;
-        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $this->currentToken)) {
+        } elseif (preg_match('/^'.self::REGEX_SHEET_TITLE_UNQUOTED.'(\\:'.self::REGEX_SHEET_TITLE_UNQUOTED.')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/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]\\$?\\d+$/u", $this->currentToken)) {
+        } elseif (preg_match("/^'".self::REGEX_SHEET_TITLE_QUOTED.'(\\:'.self::REGEX_SHEET_TITLE_QUOTED.")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/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();
@@ -1278,14 +1278,14 @@ 
             $this->advance();
 
             return $result;
-        } 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', $this->currentToken)) {
+        } 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', $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])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $this->currentToken)) {
+        } 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", $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, '', '');
@@ -1308,7 +1308,7 @@ 
             return $this->func();
         }
 
-        throw new WriterException('Syntax error: ' . $this->currentToken . ', lookahead: ' . $this->lookAhead . ', current char: ' . $this->currentCharacter);
+        throw new WriterException('Syntax error: '.$this->currentToken.', lookahead: '.$this->lookAhead.', current char: '.$this->currentCharacter);
     }
 
     /**
@@ -1429,10 +1429,10 @@ 
                 $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']);
         }
         $converted_tree = $this->convert($tree['value']);
 
-        return $polish . $converted_tree;
+        return $polish.$converted_tree;
     }
 }