Dolibarr / dolibarr

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php

Spacing +9 added lines, -9 removed lines

@@ -291,15 +291,15 @@
     public function getHashCode()
     {
         return md5(
-            $this->author .
-            $this->text->getHashCode() .
-            $this->width .
-            $this->height .
-            $this->marginLeft .
-            $this->marginTop .
-            ($this->visible ? 1 : 0) .
-            $this->fillColor->getHashCode() .
-            $this->alignment .
+            $this->author.
+            $this->text->getHashCode().
+            $this->width.
+            $this->height.
+            $this->marginLeft.
+            $this->marginTop.
+            ($this->visible ? 1 : 0).
+            $this->fillColor->getHashCode().
+            $this->alignment.
             __CLASS__
         );
     }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php

Spacing +78 added lines, -78 removed lines

@@ -2260,8 +2260,8 @@ 
 
     private static function loadLocales()
     {
-        $localeFileDirectory = __DIR__ . '/locale/';
-        foreach (glob($localeFileDirectory . '*', GLOB_ONLYDIR) as $filename) {
+        $localeFileDirectory = __DIR__.'/locale/';
+        foreach (glob($localeFileDirectory.'*', GLOB_ONLYDIR) as $filename) {
             $filename = substr($filename, strlen($localeFileDirectory));
             if ($filename != 'en') {
                 self::$validLocaleLanguages[] = $filename;
@@ -2506,10 +2506,10 @@ 
             //    Default is English, if user isn't requesting english, then read the necessary data from the locale files
             if ($locale != 'en_us') {
                 //    Search for a file with a list of function names for locale
-                $functionNamesFile = __DIR__ . '/locale/' . str_replace('_', DIRECTORY_SEPARATOR, $locale) . DIRECTORY_SEPARATOR . 'functions';
+                $functionNamesFile = __DIR__.'/locale/'.str_replace('_', DIRECTORY_SEPARATOR, $locale).DIRECTORY_SEPARATOR.'functions';
                 if (!file_exists($functionNamesFile)) {
                     //    If there isn't a locale specific function file, look for a language specific function file
-                    $functionNamesFile = __DIR__ . '/locale/' . $language . DIRECTORY_SEPARATOR . 'functions';
+                    $functionNamesFile = __DIR__.'/locale/'.$language.DIRECTORY_SEPARATOR.'functions';
                     if (!file_exists($functionNamesFile)) {
                         return false;
                     }
@@ -2535,9 +2535,9 @@ 
                     self::$localeBoolean['FALSE'] = self::$localeFunctions['FALSE'];
                 }
 
-                $configFile = __DIR__ . '/locale/' . str_replace('_', DIRECTORY_SEPARATOR, $locale) . DIRECTORY_SEPARATOR . 'config';
+                $configFile = __DIR__.'/locale/'.str_replace('_', DIRECTORY_SEPARATOR, $locale).DIRECTORY_SEPARATOR.'config';
                 if (!file_exists($configFile)) {
-                    $configFile = __DIR__ . '/locale/' . $language . DIRECTORY_SEPARATOR . 'config';
+                    $configFile = __DIR__.'/locale/'.$language.DIRECTORY_SEPARATOR.'config';
                 }
                 if (file_exists($configFile)) {
                     $localeSettings = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
@@ -2591,7 +2591,7 @@ 
                     break;
                 case $fromSeparator:
                     if (!$inBraces) {
-                        $formula = mb_substr($formula, 0, $i) . $toSeparator . mb_substr($formula, $i + 1);
+                        $formula = mb_substr($formula, 0, $i).$toSeparator.mb_substr($formula, $i + 1);
                     }
             }
         }
@@ -2648,20 +2648,20 @@ 
         if (self::$functionReplaceFromExcel === null) {
             self::$functionReplaceFromExcel = [];
             foreach (array_keys(self::$localeFunctions) as $excelFunctionName) {
-                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])' . preg_quote($excelFunctionName, '/') . '([\s]*\()/Ui';
+                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelFunctionName, '/').'([\s]*\()/Ui';
             }
             foreach (array_keys(self::$localeBoolean) as $excelBoolean) {
-                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])' . preg_quote($excelBoolean, '/') . '([^\w\.])/Ui';
+                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelBoolean, '/').'([^\w\.])/Ui';
             }
         }
 
         if (self::$functionReplaceToLocale === null) {
             self::$functionReplaceToLocale = [];
             foreach (self::$localeFunctions as $localeFunctionName) {
-                self::$functionReplaceToLocale[] = '$1' . trim($localeFunctionName) . '$2';
+                self::$functionReplaceToLocale[] = '$1'.trim($localeFunctionName).'$2';
             }
             foreach (self::$localeBoolean as $localeBoolean) {
-                self::$functionReplaceToLocale[] = '$1' . trim($localeBoolean) . '$2';
+                self::$functionReplaceToLocale[] = '$1'.trim($localeBoolean).'$2';
             }
         }
 
@@ -2677,20 +2677,20 @@ 
         if (self::$functionReplaceFromLocale === null) {
             self::$functionReplaceFromLocale = [];
             foreach (self::$localeFunctions as $localeFunctionName) {
-                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])' . preg_quote($localeFunctionName, '/') . '([\s]*\()/Ui';
+                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($localeFunctionName, '/').'([\s]*\()/Ui';
             }
             foreach (self::$localeBoolean as $excelBoolean) {
-                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])' . preg_quote($excelBoolean, '/') . '([^\w\.])/Ui';
+                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($excelBoolean, '/').'([^\w\.])/Ui';
             }
         }
 
         if (self::$functionReplaceToExcel === null) {
             self::$functionReplaceToExcel = [];
             foreach (array_keys(self::$localeFunctions) as $excelFunctionName) {
-                self::$functionReplaceToExcel[] = '$1' . trim($excelFunctionName) . '$2';
+                self::$functionReplaceToExcel[] = '$1'.trim($excelFunctionName).'$2';
             }
             foreach (array_keys(self::$localeBoolean) as $excelBoolean) {
-                self::$functionReplaceToExcel[] = '$1' . trim($excelBoolean) . '$2';
+                self::$functionReplaceToExcel[] = '$1'.trim($excelBoolean).'$2';
             }
         }
 
@@ -2724,12 +2724,12 @@ 
     {
         if (is_string($value)) {
             //    Error values cannot be "wrapped"
-            if (preg_match('/^' . self::CALCULATION_REGEXP_ERROR . '$/i', $value, $match)) {
+            if (preg_match('/^'.self::CALCULATION_REGEXP_ERROR.'$/i', $value, $match)) {
                 //    Return Excel errors "as is"
                 return $value;
             }
             //    Return strings wrapped in quotes
-            return '"' . $value . '"';
+            return '"'.$value.'"';
         //    Convert numeric errors to NaN error
         } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
             return Functions::NAN();
@@ -2995,7 +2995,7 @@ 
 
         $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null;
         $wsTitle = ($pCellParent !== null) ? $pCellParent->getTitle() : "\x00Wrk";
-        $wsCellReference = $wsTitle . '!' . $cellID;
+        $wsCellReference = $wsTitle.'!'.$cellID;
 
         if (($cellID !== null) && ($this->getValueFromCache($wsCellReference, $cellValue))) {
             return $cellValue;
@@ -3222,9 +3222,9 @@ 
                     }
                 }
 
-                return '{ ' . implode($rpad, $returnMatrix) . ' }';
+                return '{ '.implode($rpad, $returnMatrix).' }';
             } elseif (is_string($value) && (trim($value, '"') == $value)) {
-                return '"' . $value . '"';
+                return '"'.$value.'"';
             } elseif (is_bool($value)) {
                 return ($value) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
             }
@@ -3262,12 +3262,12 @@ 
                 if ($value == '') {
                     return 'an empty string';
                 } elseif ($value[0] == '#') {
-                    return 'a ' . $value . ' error';
+                    return 'a '.$value.' error';
                 }
                 $typeString = 'a string';
             }
 
-            return $typeString . ' with a value of ' . $this->showValue($value);
+            return $typeString.' with a value of '.$this->showValue($value);
         }
     }
 
@@ -3381,13 +3381,13 @@ 
         //        so we store the parent worksheet so that we can re-attach it when necessary
         $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null;
 
-        $regexpMatchString = '/^(' . self::CALCULATION_REGEXP_FUNCTION .
-                                '|' . self::CALCULATION_REGEXP_CELLREF .
-                                '|' . self::CALCULATION_REGEXP_NUMBER .
-                                '|' . self::CALCULATION_REGEXP_STRING .
-                                '|' . self::CALCULATION_REGEXP_OPENBRACE .
-                                '|' . self::CALCULATION_REGEXP_NAMEDRANGE .
-                                '|' . self::CALCULATION_REGEXP_ERROR .
+        $regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION.
+                                '|'.self::CALCULATION_REGEXP_CELLREF.
+                                '|'.self::CALCULATION_REGEXP_NUMBER.
+                                '|'.self::CALCULATION_REGEXP_STRING.
+                                '|'.self::CALCULATION_REGEXP_OPENBRACE.
+                                '|'.self::CALCULATION_REGEXP_NAMEDRANGE.
+                                '|'.self::CALCULATION_REGEXP_ERROR.
                                 ')/si';
 
         //    Start with initialisation
@@ -3494,7 +3494,7 @@ 
                     $parenthesisDepthMap[$pendingStoreKey] -= 1;
                 }
 
-                if (is_array($d) && preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
+                if (is_array($d) && preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
                     if (!empty($pendingStoreKey) && $parenthesisDepthMap[$pendingStoreKey] == -1) {
                         // we are closing an IF(
                         if ($d['value'] != 'IF(') {
@@ -3530,7 +3530,7 @@ 
                         if ($expectedArgumentCount < 0) {
                             if ($argumentCount > abs($expectedArgumentCount)) {
                                 $argumentCountError = true;
-                                $expectedArgumentCountString = 'no more than ' . abs($expectedArgumentCount);
+                                $expectedArgumentCountString = 'no more than '.abs($expectedArgumentCount);
                             }
                         } else {
                             if ($argumentCount != $expectedArgumentCount) {
@@ -3544,28 +3544,28 @@ 
                             case '+':
                                 if ($argumentCount < $argMatch[1]) {
                                     $argumentCountError = true;
-                                    $expectedArgumentCountString = $argMatch[1] . ' or more ';
+                                    $expectedArgumentCountString = $argMatch[1].' or more ';
                                 }
 
                                 break;
                             case '-':
                                 if (($argumentCount < $argMatch[1]) || ($argumentCount > $argMatch[3])) {
                                     $argumentCountError = true;
-                                    $expectedArgumentCountString = 'between ' . $argMatch[1] . ' and ' . $argMatch[3];
+                                    $expectedArgumentCountString = 'between '.$argMatch[1].' and '.$argMatch[3];
                                 }
 
                                 break;
                             case ',':
                                 if (($argumentCount != $argMatch[1]) && ($argumentCount != $argMatch[3])) {
                                     $argumentCountError = true;
-                                    $expectedArgumentCountString = 'either ' . $argMatch[1] . ' or ' . $argMatch[3];
+                                    $expectedArgumentCountString = 'either '.$argMatch[1].' or '.$argMatch[3];
                                 }
 
                                 break;
                         }
                     }
                     if ($argumentCountError) {
-                        return $this->raiseFormulaError("Formula Error: Wrong number of arguments for $functionName() function: $argumentCount given, " . $expectedArgumentCountString . ' expected');
+                        return $this->raiseFormulaError("Formula Error: Wrong number of arguments for $functionName() function: $argumentCount given, ".$expectedArgumentCountString.' expected');
                     }
                 }
                 ++$index;
@@ -3597,7 +3597,7 @@ 
                 }
                 // make sure there was a function
                 $d = $stack->last(2);
-                if (!preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $d['value'], $matches)) {
+                if (!preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {
                     return $this->raiseFormulaError('Formula Error: Unexpected ,');
                 }
                 $d = $stack->pop();
@@ -3621,7 +3621,7 @@ 
                 $val = $match[1];
                 $length = strlen($val);
 
-                if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $val, $matches)) {
+                if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $val, $matches)) {
                     $val = preg_replace('/\s/u', '', $val);
                     if (isset(self::$phpSpreadsheetFunctions[strtoupper($matches[1])]) || isset(self::$controlFunctions[strtoupper($matches[1])])) {    // it's a function
                         $valToUpper = strtoupper($val);
@@ -3642,17 +3642,17 @@ 
                         // tests if the function is closed right after opening
                         $ax = preg_match('/^\s*(\s*\))/ui', substr($formula, $index + $length), $amatch);
                         if ($ax) {
-                            $stack->push('Operand Count for Function ' . $valToUpper . ')', 0, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                            $stack->push('Operand Count for Function '.$valToUpper.')', 0, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
                             $expectingOperator = true;
                         } else {
-                            $stack->push('Operand Count for Function ' . $valToUpper . ')', 1, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                            $stack->push('Operand Count for Function '.$valToUpper.')', 1, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
                             $expectingOperator = false;
                         }
                         $stack->push('Brace', '(');
                     } else {    // it's a var w/ implicit multiplication
                         $output[] = ['type' => 'Value', 'value' => $matches[1], 'reference' => null];
                     }
-                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $val, $matches)) {
+                } elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $val, $matches)) {
                     //    Watch for this case-change when modifying to allow cell references in different worksheets...
                     //    Should only be applied to the actual cell column, not the worksheet name
 
@@ -3664,9 +3664,9 @@ 
                             //    Otherwise, we 'inherit' the worksheet reference from the start cell reference
                             //    The start of the cell range reference should be the last entry in $output
                             $startCellRef = $output[count($output) - 1]['value'];
-                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $startCellRef, $startMatches);
+                            preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $startCellRef, $startMatches);
                             if ($startMatches[2] > '') {
-                                $val = $startMatches[2] . '!' . $val;
+                                $val = $startMatches[2].'!'.$val;
                             }
                         } else {
                             return $this->raiseFormulaError('3D Range references are not yet supported');
@@ -3700,14 +3700,14 @@ 
                             ($startRowColRef <= 1048576) && ($val <= 1048576)) {
                             //    Row range
                             $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestColumn() : 'XFD'; //    Max 16,384 columns for Excel2007
-                            $output[count($output) - 1]['value'] = $rangeWS1 . 'A' . $startRowColRef;
-                            $val = $rangeWS2 . $endRowColRef . $val;
+                            $output[count($output) - 1]['value'] = $rangeWS1.'A'.$startRowColRef;
+                            $val = $rangeWS2.$endRowColRef.$val;
                         } elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) &&
                             (strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) {
                             //    Column range
                             $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestRow() : 1048576; //    Max 1,048,576 rows for Excel2007
-                            $output[count($output) - 1]['value'] = $rangeWS1 . strtoupper($startRowColRef) . '1';
-                            $val = $rangeWS2 . $val . $endRowColRef;
+                            $output[count($output) - 1]['value'] = $rangeWS1.strtoupper($startRowColRef).'1';
+                            $val = $rangeWS2.$val.$endRowColRef;
                         }
                     }
 
@@ -3769,7 +3769,7 @@ 
                 }
                 //    If we're expecting an operator, but only have a space between the previous and next operands (and both are
                 //        Cell References) then we have an INTERSECTION operator
-                if (($expectingOperator) && (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/Ui', substr($formula, $index), $match)) &&
+                if (($expectingOperator) && (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'.*/Ui', substr($formula, $index), $match)) &&
                     ($output[count($output) - 1]['type'] == 'Cell Reference')) {
                     while ($stack->count() > 0 &&
                         ($o2 = $stack->last()) &&
@@ -3802,7 +3802,7 @@ 
             $cKeys = array_keys(array_keys($operand[$rowKey]));
             $colKey = array_shift($cKeys);
             if (ctype_upper($colKey)) {
-                $operandData['reference'] = $colKey . $rowKey;
+                $operandData['reference'] = $colKey.$rowKey;
             }
         }
 
@@ -3859,17 +3859,17 @@ 
                     )
                 ) {
                     // If branching value is not true, we don't need to compute
-                    if (!isset($fakedForBranchPruning['onlyIf-' . $onlyIfStoreKey])) {
-                        $stack->push('Value', 'Pruned branch (only if ' . $onlyIfStoreKey . ') ' . $token);
-                        $fakedForBranchPruning['onlyIf-' . $onlyIfStoreKey] = true;
+                    if (!isset($fakedForBranchPruning['onlyIf-'.$onlyIfStoreKey])) {
+                        $stack->push('Value', 'Pruned branch (only if '.$onlyIfStoreKey.') '.$token);
+                        $fakedForBranchPruning['onlyIf-'.$onlyIfStoreKey] = true;
                     }
 
                     if (isset($storeKey)) {
                         // We are processing an if condition
                         // We cascade the pruning to the depending branches
                         $branchStore[$storeKey] = 'Pruned branch';
-                        $fakedForBranchPruning['onlyIfNot-' . $storeKey] = true;
-                        $fakedForBranchPruning['onlyIf-' . $storeKey] = true;
+                        $fakedForBranchPruning['onlyIfNot-'.$storeKey] = true;
+                        $fakedForBranchPruning['onlyIf-'.$storeKey] = true;
                     }
 
                     continue;
@@ -3892,17 +3892,17 @@ 
                         || ($storeValue === 'Pruned branch'))
                 ) {
                     // If branching value is true, we don't need to compute
-                    if (!isset($fakedForBranchPruning['onlyIfNot-' . $onlyIfNotStoreKey])) {
-                        $stack->push('Value', 'Pruned branch (only if not ' . $onlyIfNotStoreKey . ') ' . $token);
-                        $fakedForBranchPruning['onlyIfNot-' . $onlyIfNotStoreKey] = true;
+                    if (!isset($fakedForBranchPruning['onlyIfNot-'.$onlyIfNotStoreKey])) {
+                        $stack->push('Value', 'Pruned branch (only if not '.$onlyIfNotStoreKey.') '.$token);
+                        $fakedForBranchPruning['onlyIfNot-'.$onlyIfNotStoreKey] = true;
                     }
 
                     if (isset($storeKey)) {
                         // We are processing an if condition
                         // We cascade the pruning to the depending branches
                         $branchStore[$storeKey] = 'Pruned branch';
-                        $fakedForBranchPruning['onlyIfNot-' . $storeKey] = true;
-                        $fakedForBranchPruning['onlyIf-' . $storeKey] = true;
+                        $fakedForBranchPruning['onlyIfNot-'.$storeKey] = true;
+                        $fakedForBranchPruning['onlyIf-'.$storeKey] = true;
                     }
 
                     continue;
@@ -3960,20 +3960,20 @@ 
                         if ($sheet1 == $sheet2) {
                             if ($operand1Data['reference'] === null) {
                                 if ((trim($operand1Data['value']) != '') && (is_numeric($operand1Data['value']))) {
-                                    $operand1Data['reference'] = $pCell->getColumn() . $operand1Data['value'];
+                                    $operand1Data['reference'] = $pCell->getColumn().$operand1Data['value'];
                                 } elseif (trim($operand1Data['reference']) == '') {
                                     $operand1Data['reference'] = $pCell->getCoordinate();
                                 } else {
-                                    $operand1Data['reference'] = $operand1Data['value'] . $pCell->getRow();
+                                    $operand1Data['reference'] = $operand1Data['value'].$pCell->getRow();
                                 }
                             }
                             if ($operand2Data['reference'] === null) {
                                 if ((trim($operand2Data['value']) != '') && (is_numeric($operand2Data['value']))) {
-                                    $operand2Data['reference'] = $pCell->getColumn() . $operand2Data['value'];
+                                    $operand2Data['reference'] = $pCell->getColumn().$operand2Data['value'];
                                 } elseif (trim($operand2Data['reference']) == '') {
                                     $operand2Data['reference'] = $pCell->getCoordinate();
                                 } else {
-                                    $operand2Data['reference'] = $operand2Data['value'] . $pCell->getRow();
+                                    $operand2Data['reference'] = $operand2Data['value'].$pCell->getRow();
                                 }
                             }
 
@@ -3984,7 +3984,7 @@ 
                                 $oCol[] = Coordinate::columnIndexFromString($oCR[0]) - 1;
                                 $oRow[] = $oCR[1];
                             }
-                            $cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':' . Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow);
+                            $cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1).min($oRow).':'.Coordinate::stringFromColumnIndex(max($oCol) + 1).max($oRow);
                             if ($pCellParent !== null) {
                                 $cellValue = $this->extractCellRange($cellRef, $this->spreadsheet->getSheetByName($sheet1), false);
                             } else {
@@ -4056,7 +4056,7 @@ 
                                 $result = '#VALUE!';
                             }
                         } else {
-                            $result = '"' . str_replace('""', '"', self::unwrapResult($operand1) . self::unwrapResult($operand2)) . '"';
+                            $result = '"'.str_replace('""', '"', self::unwrapResult($operand1).self::unwrapResult($operand2)).'"';
                         }
                         $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
                         $stack->push('Value', $result);
@@ -4076,7 +4076,7 @@ 
                                 $cellIntersect[$row] = array_intersect_key($operand1[$row], $operand2[$row]);
                             }
                         }
-                        $cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':' . Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow);
+                        $cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1).min($oRow).':'.Coordinate::stringFromColumnIndex(max($oCol) + 1).max($oRow);
                         $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($cellIntersect));
                         $stack->push('Value', $cellIntersect, $cellRef);
 
@@ -4115,14 +4115,14 @@ 
                 } else {
                     $this->executeNumericBinaryOperation($multiplier, $arg, '*', 'arrayTimesEquals', $stack);
                 }
-            } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $token, $matches)) {
+            } elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $token, $matches)) {
                 $cellRef = null;
                 if (isset($matches[8])) {
                     if ($pCell === null) {
                         //                        We can't access the range, so return a REF error
                         $cellValue = Functions::REF();
                     } else {
-                        $cellRef = $matches[6] . $matches[7] . ':' . $matches[9] . $matches[10];
+                        $cellRef = $matches[6].$matches[7].':'.$matches[9].$matches[10];
                         if ($matches[2] > '') {
                             $matches[2] = trim($matches[2], "\"'");
                             if ((strpos($matches[2], '[') !== false) || (strpos($matches[2], ']') !== false)) {
@@ -4152,7 +4152,7 @@ 
                         //                        We can't access the cell, so return a REF error
                         $cellValue = Functions::REF();
                     } else {
-                        $cellRef = $matches[6] . $matches[7];
+                        $cellRef = $matches[6].$matches[7];
                         if ($matches[2] > '') {
                             $matches[2] = trim($matches[2], "\"'");
                             if ((strpos($matches[2], '[') !== false) || (strpos($matches[2], ']') !== false)) {
@@ -4190,7 +4190,7 @@ 
                 }
 
                 // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
-            } elseif (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $token, $matches)) {
+            } elseif (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $token, $matches)) {
                 if ($pCellParent) {
                     $pCell->attach($pCellParent);
                 }
@@ -4249,7 +4249,7 @@ 
                     if ($functionName != 'MKMATRIX') {
                         if ($this->debugLog->getWriteDebugLog()) {
                             krsort($argArrayVals);
-                            $this->debugLog->writeDebugLog('Evaluating ', self::localeFunc($functionName), '( ', implode(self::$localeArgumentSeparator . ' ', Functions::flattenArray($argArrayVals)), ' )');
+                            $this->debugLog->writeDebugLog('Evaluating ', self::localeFunc($functionName), '( ', implode(self::$localeArgumentSeparator.' ', Functions::flattenArray($argArrayVals)), ' )');
                         }
                     }
 
@@ -4288,7 +4288,7 @@ 
                         $branchStore[$storeKey] = $token;
                     }
                     // if the token is a named range, push the named range name onto the stack
-                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $token, $matches)) {
+                } elseif (preg_match('/^'.self::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $token, $matches)) {
                     $namedRange = $matches[6];
                     $this->debugLog->writeDebugLog('Evaluating Named Range ', $namedRange);
 
@@ -4362,7 +4362,7 @@ 
      *
      * @return mixed
      */
-    private function executeBinaryComparisonOperation($cellID, $operand1, $operand2, $operation, Stack &$stack, $recursingArrays = false)
+    private function executeBinaryComparisonOperation($cellID, $operand1, $operand2, $operation, Stack & $stack, $recursingArrays = false)
     {
         //    If we're dealing with matrix operations, we want a matrix result
         if ((is_array($operand1)) || (is_array($operand2))) {
@@ -4630,7 +4630,7 @@ 
 
             // Extract range
             $aReferences = Coordinate::extractAllCellReferencesInRange($pRange);
-            $pRange = $pSheetName . '!' . $pRange;
+            $pRange = $pSheetName.'!'.$pRange;
             if (!isset($aReferences[1])) {
                 $currentCol = '';
                 $currentRow = 0;
@@ -4689,9 +4689,9 @@ 
                 $splitRange = Coordinate::splitRange($pRange);
                 //    Convert row and column references
                 if (ctype_alpha($splitRange[0][0])) {
-                    $pRange = $splitRange[0][0] . '1:' . $splitRange[0][1] . $namedRange->getWorksheet()->getHighestRow();
+                    $pRange = $splitRange[0][0].'1:'.$splitRange[0][1].$namedRange->getWorksheet()->getHighestRow();
                 } elseif (ctype_digit($splitRange[0][0])) {
-                    $pRange = 'A' . $splitRange[0][0] . ':' . $namedRange->getWorksheet()->getHighestColumn() . $splitRange[0][1];
+                    $pRange = 'A'.$splitRange[0][0].':'.$namedRange->getWorksheet()->getHighestColumn().$splitRange[0][1];
                 }
             } else {
                 return Functions::REF();
@@ -4798,7 +4798,7 @@ 
 
     private function getUnusedBranchStoreKey()
     {
-        $storeKeyValue = 'storeKey-' . $this->branchStoreKeyCounter;
+        $storeKeyValue = 'storeKey-'.$this->branchStoreKeyCounter;
         ++$this->branchStoreKeyCounter;
 
         return $storeKeyValue;
@@ -4806,7 +4806,7 @@ 
 
     private function getTokensAsString($tokens)
     {
-        $tokensStr = array_map(function ($token) {
+        $tokensStr = array_map(function($token) {
             $value = $token['value'] ?? 'no value';
             while (is_array($value)) {
                 $value = array_pop($value);
@@ -4815,6 +4815,6 @@ 
             return $value;
         }, $tokens);
 
-        return '[ ' . implode(' | ', $tokensStr) . ' ]';
+        return '[ '.implode(' | ', $tokensStr).' ]';
     }
 }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php

Spacing +4 added lines, -4 removed lines

@@ -1102,7 +1102,7 @@ 
             //    Two's Complement
             $x = substr($x, -9);
 
-            return '-' . (512 - bindec($x));
+            return '-'.(512 - bindec($x));
         }
 
         return bindec($x);
@@ -1157,7 +1157,7 @@ 
             return Functions::NAN();
         } elseif (strlen($x) == 10) {
             //    Two's Complement
-            return str_repeat('F', 8) . substr(strtoupper(dechex(bindec(substr($x, -9)))), -2);
+            return str_repeat('F', 8).substr(strtoupper(dechex(bindec(substr($x, -9)))), -2);
         }
         $hexVal = (string) strtoupper(dechex(bindec($x)));
 
@@ -1212,7 +1212,7 @@ 
             return Functions::NAN();
         } elseif (strlen($x) == 10) {
             //    Two's Complement
-            return str_repeat('7', 7) . substr(strtoupper(decoct(bindec(substr($x, -9)))), -3);
+            return str_repeat('7', 7).substr(strtoupper(decoct(bindec(substr($x, -9)))), -3);
         }
         $octVal = (string) decoct(bindec($x));
 
@@ -1329,7 +1329,7 @@ 
         $r = strtoupper(dechex($x));
         if (strlen($r) == 8) {
             //    Two's Complement
-            $r = 'FF' . $r;
+            $r = 'FF'.$r;
         }
 
         return self::nbrConversionFormat($r, $places);

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php

Spacing +2 added lines, -2 removed lines

@@ -32,10 +32,10 @@
         $eom = self::isLastDayOfMonth($result);
 
         while ($settlement < Date::PHPToExcel($result)) {
-            $result->modify('-' . $months . ' months');
+            $result->modify('-'.$months.' months');
         }
         if ($next) {
-            $result->modify('+' . $months . ' months');
+            $result->modify('+'.$months.' months');
         }
 
         if ($eom) {

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php

Spacing +5 added lines, -5 removed lines

@@ -731,7 +731,7 @@ 
             } elseif (!$conditionIsNumeric) {
                 continue;
             }
-            $testCondition = '=' . $arg . $condition;
+            $testCondition = '='.$arg.$condition;
             if (Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 $returnValue += $averageArgs[$key];
                 ++$aCount;
@@ -1170,7 +1170,7 @@ 
             } elseif (!$conditionIsNumeric) {
                 continue;
             }
-            $testCondition = '=' . $arg . $condition;
+            $testCondition = '='.$arg.$condition;
             if (Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 // Is it a value within our criteria
                 ++$returnValue;
@@ -1234,7 +1234,7 @@ 
 
                     break; // if false found, don't need to check other conditions
                 }
-                $testCondition = '=' . $arg . $condition;
+                $testCondition = '='.$arg.$condition;
                 if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                     // Is not a value within our criteria
                     $valid = false;
@@ -2263,7 +2263,7 @@ 
                 if (!is_numeric($arg)) {
                     $arg = Calculation::wrapResult(strtoupper($arg));
                 }
-                $testCondition = '=' . $arg . $condition;
+                $testCondition = '='.$arg.$condition;
                 if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                     // Is not a value within our criteria
                     $valid = false;
@@ -2443,7 +2443,7 @@ 
                 if (!is_numeric($arg)) {
                     $arg = Calculation::wrapResult(strtoupper($arg));
                 }
-                $testCondition = '=' . $arg . $condition;
+                $testCondition = '='.$arg.$condition;
                 if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                     // Is not a value within our criteria
                     $valid = false;

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php

Spacing +5 added lines, -5 removed lines

@@ -67,12 +67,12 @@ 
             $testConditionCount = 0;
             foreach ($criteria as $row => $criterion) {
                 if ($criterion[$key] > '') {
-                    $testCondition[] = '[:' . $criteriaName . ']' . Functions::ifCondition($criterion[$key]);
+                    $testCondition[] = '[:'.$criteriaName.']'.Functions::ifCondition($criterion[$key]);
                     ++$testConditionCount;
                 }
             }
             if ($testConditionCount > 1) {
-                $testConditions[] = 'OR(' . implode(',', $testCondition) . ')';
+                $testConditions[] = 'OR('.implode(',', $testCondition).')';
                 ++$testConditionsCount;
             } elseif ($testConditionCount == 1) {
                 $testConditions[] = $testCondition[0];
@@ -81,7 +81,7 @@ 
         }
 
         if ($testConditionsCount > 1) {
-            $testConditionSet = 'AND(' . implode(',', $testConditions) . ')';
+            $testConditionSet = 'AND('.implode(',', $testConditions).')';
         } elseif ($testConditionsCount == 1) {
             $testConditionSet = $testConditions[0];
         }
@@ -95,11 +95,11 @@ 
                 if (isset($dataValues[$k])) {
                     $dataValue = $dataValues[$k];
                     $dataValue = (is_string($dataValue)) ? Calculation::wrapResult(strtoupper($dataValue)) : $dataValue;
-                    $testConditionList = str_replace('[:' . $criteriaName . ']', $dataValue, $testConditionList);
+                    $testConditionList = str_replace('[:'.$criteriaName.']', $dataValue, $testConditionList);
                 }
             }
             //    evaluate the criteria against the row data
-            $result = Calculation::getInstance()->_calculateFormulaValue('=' . $testConditionList);
+            $result = Calculation::getInstance()->_calculateFormulaValue('='.$testConditionList);
             //    If the row failed to meet the criteria, remove it from the database
             if (!$result) {
                 unset($database[$dataRow]);

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
             while (is_array($value)) {
                 $value = array_pop($value);
             }
-            $str .= $value . ' |> ';
+            $str .= $value.' |> ';
         }
 
         return $str;

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php

Spacing +3 added lines, -3 removed lines

@@ -94,7 +94,7 @@ 
             return Functions::VALUE();
         }
 
-        $args = array_filter($args, function ($value) {
+        $args = array_filter($args, function($value) {
             return $value !== null || (is_string($value) && trim($value) == '');
         });
         $argCount = count($args);
@@ -137,7 +137,7 @@ 
             return Functions::VALUE();
         }
 
-        $args = array_filter($args, function ($value) {
+        $args = array_filter($args, function($value) {
             return $value !== null || (is_string($value) && trim($value) == '');
         });
 
@@ -180,7 +180,7 @@ 
             return Functions::VALUE();
         }
 
-        $args = array_filter($args, function ($value) {
+        $args = array_filter($args, function($value) {
             return $value !== null || (is_string($value) && trim($value) == '');
         });
 

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php

Spacing +8 added lines, -8 removed lines

@@ -1119,7 +1119,7 @@ 
         $t = self::romanCut($aValue, 10);
         $aValue %= 10;
 
-        return $roman . $mill[$m] . $cent[$c] . $tens[$t] . $ones[$aValue];
+        return $roman.$mill[$m].$cent[$c].$tens[$t].$ones[$aValue];
     }
 
     /**
@@ -1271,7 +1271,7 @@ 
     {
         return array_filter(
             $args,
-            function ($index) use ($cellReference) {
+            function($index) use ($cellReference) {
                 [, $row, $column] = explode('.', $index);
 
                 return $cellReference->getWorksheet()->getRowDimension($row)->getVisible() &&
@@ -1285,12 +1285,12 @@ 
     {
         return array_filter(
             $args,
-            function ($index) use ($cellReference) {
+            function($index) use ($cellReference) {
                 [, $row, $column] = explode('.', $index);
-                if ($cellReference->getWorksheet()->cellExists($column . $row)) {
+                if ($cellReference->getWorksheet()->cellExists($column.$row)) {
                     //take this cell out if it contains the SUBTOTAL or AGGREGATE functions in a formula
-                    $isFormula = $cellReference->getWorksheet()->getCell($column . $row)->isFormula();
-                    $cellFormula = !preg_match('/^=.*\b(SUBTOTAL|AGGREGATE)\s*\(/i', $cellReference->getWorksheet()->getCell($column . $row)->getValue());
+                    $isFormula = $cellReference->getWorksheet()->getCell($column.$row)->isFormula();
+                    $cellFormula = !preg_match('/^=.*\b(SUBTOTAL|AGGREGATE)\s*\(/i', $cellReference->getWorksheet()->getCell($column.$row)->getValue());
 
                     return !$isFormula || $cellFormula;
                 }
@@ -1421,7 +1421,7 @@ 
                 $arg = Calculation::wrapResult(strtoupper($arg));
             }
 
-            $testCondition = '=' . $arg . $condition;
+            $testCondition = '='.$arg.$condition;
             $sumValue = array_key_exists($key, $sumArgs) ? $sumArgs[$key] : 0;
 
             if (is_numeric($sumValue) &&
@@ -1476,7 +1476,7 @@ 
                 if (!is_numeric($arg)) {
                     $arg = Calculation::wrapResult(strtoupper($arg));
                 }
-                $testCondition = '=' . $arg . $condition;
+                $testCondition = '='.$arg.$condition;
                 if (!Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                     // Is not a value within our criteria
                     $valid = false;