Dolibarr / dolibarr

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php

Spacing +8 added lines, -8 removed lines

@@ -206,7 +206,7 @@ 
 
             $meanSquareDeviations[$delimiter] = array_reduce(
                 $series,
-                function ($sum, $value) use ($median) {
+                function($sum, $value) use ($median) {
                     return $sum + pow($value - $median, 2);
                 }
             ) / count($series);
@@ -251,16 +251,16 @@ 
         }
 
         // Add the new line to the line passed in
-        $line = $line . $newLine;
+        $line = $line.$newLine;
 
         // Drop everything that is enclosed to avoid counting false positives in enclosures
-        $enclosure = '(?<!' . preg_quote($this->escapeCharacter, '/') . ')'
+        $enclosure = '(?<!'.preg_quote($this->escapeCharacter, '/').')'
             . preg_quote($this->enclosure, '/');
-        $line = preg_replace('/(' . $enclosure . '.*' . $enclosure . ')/Us', '', $line);
+        $line = preg_replace('/('.$enclosure.'.*'.$enclosure.')/Us', '', $line);
 
         // See if we have any enclosures left in the line
         // if we still have an enclosure then we need to read the next line as well
-        if (preg_match('/(' . $enclosure . ')/', $line) > 0) {
+        if (preg_match('/('.$enclosure.')/', $line) > 0) {
             $line = $this->getNextLine($line);
         }
 
@@ -280,7 +280,7 @@ 
     {
         // Open file
         if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+            throw new Exception($pFilename.' is an Invalid Spreadsheet file.');
         }
         $this->openFile($pFilename);
         $fileHandle = $this->fileHandle;
@@ -347,7 +347,7 @@ 
 
         // Open file
         if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+            throw new Exception($pFilename.' is an Invalid Spreadsheet file.');
         }
         $this->openFile($pFilename);
         $fileHandle = $this->fileHandle;
@@ -380,7 +380,7 @@ 
                     }
 
                     // Set cell value
-                    $sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum);
+                    $sheet->getCell($columnLetter.$currentRow)->setValue($rowDatum);
                 }
                 ++$columnLetter;
             }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php

Spacing +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
         $data = fread($fh, 2);
         fclose($fh);
 
-        return $data == chr(0x1F) . chr(0x8B);
+        return $data == chr(0x1F).chr(0x8B);
     }
 
     /**
@@ -79,7 +79,7 @@ 
         File::assertFile($pFilename);
 
         $xml = new XMLReader();
-        $xml->xml($this->securityScanner->scanFile('compress.zlib://' . realpath($pFilename)), null, Settings::getLibXmlLoaderOptions());
+        $xml->xml($this->securityScanner->scanFile('compress.zlib://'.realpath($pFilename)), null, Settings::getLibXmlLoaderOptions());
         $xml->setParserProperty(2, true);
 
         $worksheetNames = [];
@@ -108,7 +108,7 @@ 
         File::assertFile($pFilename);
 
         $xml = new XMLReader();
-        $xml->xml($this->securityScanner->scanFile('compress.zlib://' . realpath($pFilename)), null, Settings::getLibXmlLoaderOptions());
+        $xml->xml($this->securityScanner->scanFile('compress.zlib://'.realpath($pFilename)), null, Settings::getLibXmlLoaderOptions());
         $xml->setParserProperty(2, true);
 
         $worksheetInfo = [];
@@ -457,7 +457,7 @@ 
                         case '80':        //    Array
                     }
                 }
-                $spreadsheet->getActiveSheet()->getCell($column . $row)->setValueExplicit($cell, $type);
+                $spreadsheet->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell, $type);
             }
 
             if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
@@ -480,7 +480,7 @@ 
                     $endColumn = Coordinate::stringFromColumnIndex($endColumn + 1);
                     $endRow = ($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow'];
                     $endRow += 1;
-                    $cellRange = $startColumn . $startRow . ':' . $endColumn . $endRow;
+                    $cellRange = $startColumn.$startRow.':'.$endColumn.$endRow;
 
                     $styleAttributes = $styleRegion->Style->attributes();
 
@@ -884,6 +884,6 @@ 
         $gnmG = substr(str_pad($gnmG, 4, '0', STR_PAD_RIGHT), 0, 2);
         $gnmB = substr(str_pad($gnmB, 4, '0', STR_PAD_RIGHT), 0, 2);
 
-        return $gnmR . $gnmG . $gnmB;
+        return $gnmR.$gnmG.$gnmB;
     }
 }

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

Spacing +46 added lines, -46 removed lines

@@ -1178,7 +1178,7 @@ 
                     [$column, $row] = Coordinate::coordinateFromString($cell);
                     if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($column, $row, $this->phpSheet->getTitle())) {
                         $formula = $this->getFormulaFromStructure($this->sharedFormulas[$baseCell], $cell);
-                        $this->phpSheet->getCell($cell)->setValueExplicit('=' . $formula, DataType::TYPE_FORMULA);
+                        $this->phpSheet->getCell($cell)->setValueExplicit('='.$formula, DataType::TYPE_FORMULA);
                     }
                 }
             }
@@ -1217,7 +1217,7 @@ 
                             $sheetName = trim($explodes[0], "'");
                             if (count($explodes) == 2) {
                                 if (strpos($explodes[1], ':') === false) {
-                                    $explodes[1] = $explodes[1] . ':' . $explodes[1];
+                                    $explodes[1] = $explodes[1].':'.$explodes[1];
                                 }
                                 $extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
                             }
@@ -1709,7 +1709,7 @@ 
                 //    Concatenate this extension with the currently set comment for the cell
                 $comment = $this->phpSheet->getComment($cellAddress);
                 $commentText = $comment->getText()->getPlainText();
-                $comment->setText($this->parseRichText($commentText . $noteText));
+                $comment->setText($this->parseRichText($commentText.$noteText));
             } else {
                 //    Set comment for the cell
                 $this->phpSheet->getComment($cellAddress)->setText($this->parseRichText($noteText));
@@ -1950,7 +1950,7 @@ 
         $salt = $key->RC4($salt_data);
         $hashedsalt = $key->RC4($hashedsalt_data);
 
-        $salt .= "\x80" . str_repeat("\0", 47);
+        $salt .= "\x80".str_repeat("\0", 47);
         $salt[56] = "\x80";
 
         $md5->reset();
@@ -2921,7 +2921,7 @@ 
 
             // offset: var; size: $flen; formula data
             $offset = 14 + $string['size'];
-            $formulaStructure = pack('v', $flen) . substr($recordData, $offset);
+            $formulaStructure = pack('v', $flen).substr($recordData, $offset);
 
             try {
                 $formula = $this->getFormulaFromStructure($formulaStructure);
@@ -3090,7 +3090,7 @@ 
                         $newstr = '';
                         $jMax = strlen($retstr);
                         for ($j = 0; $j < $jMax; ++$j) {
-                            $newstr .= $retstr[$j] . chr(0);
+                            $newstr .= $retstr[$j].chr(0);
                         }
                         $retstr = $newstr;
                         $len = min($charsLeft * 2, $limitpos - $pos);
@@ -3736,7 +3736,7 @@ 
             $rknum = self::getInt4d($recordData, 6);
             $numValue = self::getIEEE754($rknum);
 
-            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            $cell = $this->phpSheet->getCell($columnString.($row + 1));
             if (!$this->readDataOnly) {
                 // add style information
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
@@ -3813,13 +3813,13 @@ 
                     }
                 }
                 if ($this->readEmptyCells || trim($richText->getPlainText()) !== '') {
-                    $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                    $cell = $this->phpSheet->getCell($columnString.($row + 1));
                     $cell->setValueExplicit($richText, DataType::TYPE_STRING);
                     $emptyCell = false;
                 }
             } else {
                 if ($this->readEmptyCells || trim($this->sst[$index]['value']) !== '') {
-                    $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                    $cell = $this->phpSheet->getCell($columnString.($row + 1));
                     $cell->setValueExplicit($this->sst[$index]['value'], DataType::TYPE_STRING);
                     $emptyCell = false;
                 }
@@ -3871,7 +3871,7 @@ 
 
                 // offset: var; size: 4; RK value
                 $numValue = self::getIEEE754(self::getInt4d($recordData, $offset + 2));
-                $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                $cell = $this->phpSheet->getCell($columnString.($row + 1));
                 if (!$this->readDataOnly) {
                     // add style
                     $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
@@ -3915,7 +3915,7 @@ 
 
             $numValue = self::extractNumber(substr($recordData, 6, 8));
 
-            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            $cell = $this->phpSheet->getCell($columnString.($row + 1));
             if (!$this->readDataOnly) {
                 // add cell style
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
@@ -3971,14 +3971,14 @@ 
             // get the base cell, grab tExp token
             $baseRow = self::getUInt2d($formulaStructure, 3);
             $baseCol = self::getUInt2d($formulaStructure, 5);
-            $this->baseCell = Coordinate::stringFromColumnIndex($baseCol + 1) . ($baseRow + 1);
+            $this->baseCell = Coordinate::stringFromColumnIndex($baseCol + 1).($baseRow + 1);
         }
 
         // Read cell?
         if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
             if ($isPartOfSharedFormula) {
                 // formula is added to this cell after the sheet has been read
-                $this->sharedFormulaParts[$columnString . ($row + 1)] = $this->baseCell;
+                $this->sharedFormulaParts[$columnString.($row + 1)] = $this->baseCell;
             }
 
             // offset: 16: size: 4; not used
@@ -4023,7 +4023,7 @@ 
                 $value = self::extractNumber(substr($recordData, 6, 8));
             }
 
-            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            $cell = $this->phpSheet->getCell($columnString.($row + 1));
             if (!$this->readDataOnly) {
                 // add cell style
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
@@ -4038,7 +4038,7 @@ 
                         throw new Exception('Not BIFF8. Can only read BIFF8 formulas');
                     }
                     $formula = $this->getFormulaFromStructure($formulaStructure); // get formula in human language
-                    $cell->setValueExplicit('=' . $formula, DataType::TYPE_FORMULA);
+                    $cell->setValueExplicit('='.$formula, DataType::TYPE_FORMULA);
                 } catch (PhpSpreadsheetException $e) {
                     $cell->setValueExplicit($value, $dataType);
                 }
@@ -4144,7 +4144,7 @@ 
             // offset: 7; size: 1; 0=boolean; 1=error
             $isError = ord($recordData[7]);
 
-            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            $cell = $this->phpSheet->getCell($columnString.($row + 1));
             switch ($isError) {
                 case 0: // boolean
                     $value = (bool) $boolErr;
@@ -4200,7 +4200,7 @@ 
                 // Read cell?
                 if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
                     $xfIndex = self::getUInt2d($recordData, 4 + 2 * $i);
-                    $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                    $this->phpSheet->getCell($columnString.($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
                 }
             }
         }
@@ -4248,7 +4248,7 @@ 
                 $value = $string['value'];
             }
             if ($this->readEmptyCells || trim($value) !== '') {
-                $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                $cell = $this->phpSheet->getCell($columnString.($row + 1));
                 $cell->setValueExplicit($value, DataType::TYPE_STRING);
 
                 if (!$this->readDataOnly) {
@@ -4284,7 +4284,7 @@ 
 
             // add style information
             if (!$this->readDataOnly && $this->readEmptyCells) {
-                $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                $this->phpSheet->getCell($columnString.($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
         }
     }
@@ -4498,8 +4498,8 @@ 
 
             if ($this->frozen) {
                 // frozen panes
-                $cell = Coordinate::stringFromColumnIndex($px + 1) . ($py + 1);
-                $topLeftCell = Coordinate::stringFromColumnIndex($colLeft + 1) . ($rwTop + 1);
+                $cell = Coordinate::stringFromColumnIndex($px + 1).($py + 1);
+                $topLeftCell = Coordinate::stringFromColumnIndex($colLeft + 1).($rwTop + 1);
                 $this->phpSheet->freezePane($cell, $topLeftCell);
             }
             // unfrozen panes; split windows; not supported by PhpSpreadsheet core
@@ -4945,7 +4945,7 @@ 
 
         // offset: var; size: $sz1; formula data for first condition (without size field)
         $formula1 = substr($recordData, $offset, $sz1);
-        $formula1 = pack('v', $sz1) . $formula1; // prepend the length
+        $formula1 = pack('v', $sz1).$formula1; // prepend the length
         try {
             $formula1 = $this->getFormulaFromStructure($formula1);
 
@@ -4967,7 +4967,7 @@ 
 
         // offset: var; size: $sz2; formula data for second condition (without size field)
         $formula2 = substr($recordData, $offset, $sz2);
-        $formula2 = pack('v', $sz2) . $formula2; // prepend the length
+        $formula2 = pack('v', $sz2).$formula2; // prepend the length
         try {
             $formula2 = $this->getFormulaFromStructure($formula2);
         } catch (PhpSpreadsheetException $e) {
@@ -5447,7 +5447,7 @@ 
                             $ops[] = array_pop($formulaStrings);
                         }
                         $ops = array_reverse($ops);
-                        $formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ')';
+                        $formulaStrings[] = "$space1$space0{$token['data']['function']}(".implode(',', $ops).')';
                         unset($space0, $space1);
                     } else {
                         // add-in function
@@ -5457,7 +5457,7 @@ 
                         }
                         $ops = array_reverse($ops);
                         $function = array_pop($formulaStrings);
-                        $formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ')';
+                        $formulaStrings[] = "$space1$space0$function(".implode(',', $ops).')';
                         unset($space0, $space1);
                     }
 
@@ -5470,7 +5470,7 @@ 
                     break;
                 case 'tArray': // array constant
                     $constantArray = self::readBIFF8ConstantArray($additionalData);
-                    $formulaStrings[] = $space1 . $space0 . $constantArray['value'];
+                    $formulaStrings[] = $space1.$space0.$constantArray['value'];
                     $additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
                     unset($space0, $space1);
 
@@ -7089,7 +7089,7 @@ 
                 break;
             // Unknown cases    // don't know how to deal with
             default:
-                throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
+                throw new Exception('Unrecognized token '.sprintf('%02X', $id).' in formula');
 
                 break;
         }
@@ -7121,14 +7121,14 @@ 
 
         // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
         if (!(0x4000 & self::getUInt2d($cellAddressStructure, 2))) {
-            $column = '$' . $column;
+            $column = '$'.$column;
         }
         // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
         if (!(0x8000 & self::getUInt2d($cellAddressStructure, 2))) {
-            $row = '$' . $row;
+            $row = '$'.$row;
         }
 
-        return $column . $row;
+        return $column.$row;
     }
 
     /**
@@ -7157,7 +7157,7 @@ 
             $colIndex = 0x00FF & self::getUInt2d($cellAddressStructure, 2);
 
             $column = Coordinate::stringFromColumnIndex($colIndex + 1);
-            $column = '$' . $column;
+            $column = '$'.$column;
         } else {
             // offset: 2; size: 2; index to column or column offset + relative flags
             // bit: 7-0; mask 0x00FF; column index
@@ -7170,13 +7170,13 @@ 
 
         // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
         if (!(0x8000 & self::getUInt2d($cellAddressStructure, 2))) {
-            $row = '$' . $row;
+            $row = '$'.$row;
         } else {
             $rowIndex = ($rowIndex <= 32767) ? $rowIndex : $rowIndex - 65536;
             $row = $baseRow + $rowIndex;
         }
 
-        return $column . $row;
+        return $column.$row;
     }
 
     /**
@@ -7288,12 +7288,12 @@ 
 
         // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
         if (!(0x4000 & self::getUInt2d($subData, 4))) {
-            $fc = '$' . $fc;
+            $fc = '$'.$fc;
         }
 
         // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
         if (!(0x8000 & self::getUInt2d($subData, 4))) {
-            $fr = '$' . $fr;
+            $fr = '$'.$fr;
         }
 
         // offset: 6; size: 2; index to last column or column offset + relative flags
@@ -7303,12 +7303,12 @@ 
 
         // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
         if (!(0x4000 & self::getUInt2d($subData, 6))) {
-            $lc = '$' . $lc;
+            $lc = '$'.$lc;
         }
 
         // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
         if (!(0x8000 & self::getUInt2d($subData, 6))) {
-            $lr = '$' . $lr;
+            $lr = '$'.$lr;
         }
 
         return "$fc$fr:$lc$lr";
@@ -7345,7 +7345,7 @@ 
             // bit: 7-0; mask 0x00FF; column index
             $fcIndex = 0x00FF & self::getUInt2d($subData, 4);
             $fc = Coordinate::stringFromColumnIndex($fcIndex + 1);
-            $fc = '$' . $fc;
+            $fc = '$'.$fc;
         } else {
             // column offset
             // offset: 4; size: 2; first column with relative/absolute flags
@@ -7361,7 +7361,7 @@ 
         if (!(0x8000 & self::getUInt2d($subData, 4))) {
             // absolute row index
             $fr = $frIndex + 1;
-            $fr = '$' . $fr;
+            $fr = '$'.$fr;
         } else {
             // row offset
             $frIndex = ($frIndex <= 32767) ? $frIndex : $frIndex - 65536;
@@ -7375,7 +7375,7 @@ 
             // bit: 7-0; mask 0x00FF; column index
             $lcIndex = 0x00FF & self::getUInt2d($subData, 6);
             $lc = Coordinate::stringFromColumnIndex($lcIndex + 1);
-            $lc = '$' . $lc;
+            $lc = '$'.$lc;
         } else {
             // column offset
             // offset: 4; size: 2; first column with relative/absolute flags
@@ -7391,7 +7391,7 @@ 
         if (!(0x8000 & self::getUInt2d($subData, 6))) {
             // absolute row index
             $lr = $lrIndex + 1;
-            $lr = '$' . $lr;
+            $lr = '$'.$lr;
         } else {
             // row offset
             $lrIndex = ($lrIndex <= 32767) ? $lrIndex : $lrIndex - 65536;
@@ -7548,7 +7548,7 @@ 
             }
             $matrixChunks[] = implode(',', $items); // looks like e.g. '1,"hello"'
         }
-        $matrix = '{' . implode(';', $matrixChunks) . '}';
+        $matrix = '{'.implode(';', $matrixChunks).'}';
 
         return [
             'value' => $matrix,
@@ -7585,7 +7585,7 @@ 
             case 0x02: // string value
                 // offset: 1; size: var; Unicode string, 16-bit string length
                 $string = self::readUnicodeStringLong(substr($valueData, 1));
-                $value = '"' . $string['value'] . '"';
+                $value = '"'.$string['value'].'"';
                 $size = 1 + $string['size'];
 
                 break;
@@ -7776,7 +7776,7 @@ 
      */
     private static function UTF8toExcelDoubleQuoted($value)
     {
-        return '"' . str_replace('"', '""', $value) . '"';
+        return '"'.str_replace('"', '""', $value).'"';
     }
 
     /**
@@ -7869,7 +7869,7 @@ 
         $uncompressedString = '';
         $strLen = strlen($string);
         for ($i = 0; $i < $strLen; ++$i) {
-            $uncompressedString .= $string[$i] . "\0";
+            $uncompressedString .= $string[$i]."\0";
         }
 
         return $uncompressedString;
@@ -7910,7 +7910,7 @@ 
      */
     public static function getInt2d($data, $pos)
     {
-        return unpack('s', $data[$pos] . $data[$pos + 1])[1];
+        return unpack('s', $data[$pos].$data[$pos + 1])[1];
     }
 
     /**

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
         $xml = $this->toUtf8($xml);
 
         // Don't rely purely on libxml_disable_entity_loader()
-        $pattern = '/\\0?' . implode('\\0?', str_split($this->pattern)) . '\\0?/';
+        $pattern = '/\\0?'.implode('\\0?', str_split($this->pattern)).'\\0?/';
 
         if (preg_match($pattern, $xml)) {
             throw new Reader\Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php

Spacing +10 added lines, -10 removed lines

@@ -95,14 +95,14 @@ 
 
         $zip = new ZipArchive();
         if (!$zip->open($pFilename)) {
-            throw new Exception('Could not open ' . $pFilename . ' for reading! Error opening file.');
+            throw new Exception('Could not open '.$pFilename.' for reading! Error opening file.');
         }
 
         $worksheetNames = [];
 
         $xml = new XMLReader();
         $xml->xml(
-            $this->securityScanner->scanFile('zip://' . realpath($pFilename) . '#content.xml'),
+            $this->securityScanner->scanFile('zip://'.realpath($pFilename).'#content.xml'),
             null,
             Settings::getLibXmlLoaderOptions()
         );
@@ -151,12 +151,12 @@ 
 
         $zip = new ZipArchive();
         if (!$zip->open($pFilename)) {
-            throw new Exception('Could not open ' . $pFilename . ' for reading! Error opening file.');
+            throw new Exception('Could not open '.$pFilename.' for reading! Error opening file.');
         }
 
         $xml = new XMLReader();
         $xml->xml(
-            $this->securityScanner->scanFile('zip://' . realpath($pFilename) . '#content.xml'),
+            $this->securityScanner->scanFile('zip://'.realpath($pFilename).'#content.xml'),
             null,
             Settings::getLibXmlLoaderOptions()
         );
@@ -397,7 +397,7 @@ 
                                         $text = $this->scanElementForText($textNode->item(0));
 
                                         $spreadsheet->getActiveSheet()
-                                            ->getComment($columnID . $rowID)
+                                            ->getComment($columnID.$rowID)
                                             ->setText($this->parseRichText($text));
 //                                                                    ->setAuthor( $author )
                                     }
@@ -520,7 +520,7 @@ 
 
                                             $dataValue = Date::PHPToExcel(
                                                 strtotime(
-                                                    '01-01-1970 ' . implode(':', sscanf($timeValue, 'PT%dH%dM%dS'))
+                                                    '01-01-1970 '.implode(':', sscanf($timeValue, 'PT%dH%dM%dS'))
                                                 )
                                             );
                                             $formatting = NumberFormat::FORMAT_DATE_TIME4;
@@ -580,7 +580,7 @@ 
                                                 $rID = $rowID + $rowAdjust;
 
                                                 $cell = $spreadsheet->getActiveSheet()
-                                                    ->getCell($columnID . $rID);
+                                                    ->getCell($columnID.$rID);
 
                                                 // Set value
                                                 if ($hasCalculatedValue) {
@@ -596,12 +596,12 @@ 
                                                 // Set other properties
                                                 if ($formatting !== null) {
                                                     $spreadsheet->getActiveSheet()
-                                                        ->getStyle($columnID . $rID)
+                                                        ->getStyle($columnID.$rID)
                                                         ->getNumberFormat()
                                                         ->setFormatCode($formatting);
                                                 } else {
                                                     $spreadsheet->getActiveSheet()
-                                                        ->getStyle($columnID . $rID)
+                                                        ->getStyle($columnID.$rID)
                                                         ->getNumberFormat()
                                                         ->setFormatCode(NumberFormat::FORMAT_GENERAL);
                                                 }
@@ -636,7 +636,7 @@ 
                                             $rowTo = $rowTo + (int) $cellData->getAttributeNS($tableNs, 'number-rows-spanned') - 1;
                                         }
 
-                                        $cellRange = $columnID . $rowID . ':' . $columnTo . $rowTo;
+                                        $cellRange = $columnID.$rowID.':'.$columnTo.$rowTo;
                                         $spreadsheet->getActiveSheet()->mergeCells($cellRange);
                                     }
                                 }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php

Spacing +21 added lines, -21 removed lines

@@ -280,13 +280,13 @@ 
                 //    Only actually write it if there's content in the string
                 //    Write to worksheet to be done here...
                 //    ... we return the cell so we can mess about with styles more easily
-                $sheet->setCellValue($column . $row, $cellContent);
+                $sheet->setCellValue($column.$row, $cellContent);
                 $this->dataArray[$row][$column] = $cellContent;
             }
         } else {
             //    We have a Rich Text run
             //    TODO
-            $this->dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
+            $this->dataArray[$row][$column] = 'RICH TEXT: '.$cellContent;
         }
         $cellContent = (string) '';
     }
@@ -340,7 +340,7 @@ 
                     case 'strong':
                     case 'b':
                         if (isset($attributeArray['class']) && $attributeArray['class'] === 'comment') {
-                            $sheet->getComment($column . $row)
+                            $sheet->getComment($column.$row)
                                 ->getText()
                                 ->createTextRun($child->textContent);
 
@@ -356,7 +356,7 @@ 
                         }
 
                         if (isset($this->formats[$child->nodeName])) {
-                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                            $sheet->getStyle($column.$row)->applyFromArray($this->formats[$child->nodeName]);
                         }
 
                         break;
@@ -364,7 +364,7 @@ 
                         $this->flushCell($sheet, $column, $row, $cellContent);
                         ++$row;
                         if (isset($this->formats[$child->nodeName])) {
-                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                            $sheet->getStyle($column.$row)->applyFromArray($this->formats[$child->nodeName]);
                         } else {
                             $cellContent = '----------';
                             $this->flushCell($sheet, $column, $row, $cellContent);
@@ -376,7 +376,7 @@ 
                         if ($this->tableLevel > 0) {
                             //    If we're inside a table, replace with a \n and set the cell to wrap
                             $cellContent .= "\n";
-                            $sheet->getStyle($column . $row)->getAlignment()->setWrapText(true);
+                            $sheet->getStyle($column.$row)->getAlignment()->setWrapText(true);
                         } else {
                             //    Otherwise flush our existing content and move the row cursor on
                             $this->flushCell($sheet, $column, $row, $cellContent);
@@ -388,9 +388,9 @@ 
                         foreach ($attributeArray as $attributeName => $attributeValue) {
                             switch ($attributeName) {
                                 case 'href':
-                                    $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
+                                    $sheet->getCell($column.$row)->getHyperlink()->setUrl($attributeValue);
                                     if (isset($this->formats[$child->nodeName])) {
-                                        $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                                        $sheet->getStyle($column.$row)->applyFromArray($this->formats[$child->nodeName]);
                                     }
 
                                     break;
@@ -426,7 +426,7 @@ 
                             $this->flushCell($sheet, $column, $row, $cellContent);
 
                             if (isset($this->formats[$child->nodeName])) {
-                                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                                $sheet->getStyle($column.$row)->applyFromArray($this->formats[$child->nodeName]);
                             }
 
                             ++$row;
@@ -490,7 +490,7 @@ 
                     case 'td':
                         $this->processDomElement($child, $sheet, $row, $column, $cellContent);
 
-                        while (isset($this->rowspan[$column . $row])) {
+                        while (isset($this->rowspan[$column.$row])) {
                             ++$column;
                         }
 
@@ -505,7 +505,7 @@ 
                             for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
                                 ++$columnTo;
                             }
-                            $range = $column . $row . ':' . $columnTo . ($row + (int) $attributeArray['rowspan'] - 1);
+                            $range = $column.$row.':'.$columnTo.($row + (int) $attributeArray['rowspan'] - 1);
                             foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
                                 $this->rowspan[$value] = true;
                             }
@@ -513,7 +513,7 @@ 
                             $column = $columnTo;
                         } elseif (isset($attributeArray['rowspan'])) {
                             //create merging rowspan
-                            $range = $column . $row . ':' . $column . ($row + (int) $attributeArray['rowspan'] - 1);
+                            $range = $column.$row.':'.$column.($row + (int) $attributeArray['rowspan'] - 1);
                             foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
                                 $this->rowspan[$value] = true;
                             }
@@ -524,10 +524,10 @@ 
                             for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
                                 ++$columnTo;
                             }
-                            $sheet->mergeCells($column . $row . ':' . $columnTo . $row);
+                            $sheet->mergeCells($column.$row.':'.$columnTo.$row);
                             $column = $columnTo;
                         } elseif (isset($attributeArray['bgcolor'])) {
-                            $sheet->getStyle($column . $row)->applyFromArray(
+                            $sheet->getStyle($column.$row)->applyFromArray(
                                 [
                                     'fill' => [
                                         'fillType' => Fill::FILL_SOLID,
@@ -546,15 +546,15 @@ 
                         }
 
                         if (isset($attributeArray['align'])) {
-                            $sheet->getStyle($column . $row)->getAlignment()->setHorizontal($attributeArray['align']);
+                            $sheet->getStyle($column.$row)->getAlignment()->setHorizontal($attributeArray['align']);
                         }
 
                         if (isset($attributeArray['valign'])) {
-                            $sheet->getStyle($column . $row)->getAlignment()->setVertical($attributeArray['valign']);
+                            $sheet->getStyle($column.$row)->getAlignment()->setVertical($attributeArray['valign']);
                         }
 
                         if (isset($attributeArray['data-format'])) {
-                            $sheet->getStyle($column . $row)->getNumberFormat()->setFormatCode($attributeArray['data-format']);
+                            $sheet->getStyle($column.$row)->getNumberFormat()->setFormatCode($attributeArray['data-format']);
                         }
 
                         ++$column;
@@ -589,7 +589,7 @@ 
     {
         // Validate
         if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid HTML file.');
+            throw new Exception($pFilename.' is an Invalid HTML file.');
         }
 
         // Create a new DOM object
@@ -597,7 +597,7 @@ 
         // Reload the HTML file into the DOM object
         $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanner->scanFile($pFilename), 'HTML-ENTITIES', 'UTF-8'));
         if ($loaded === false) {
-            throw new Exception('Failed to load ' . $pFilename . ' as a DOM Document');
+            throw new Exception('Failed to load '.$pFilename.' as a DOM Document');
         }
 
         return $this->loadDocument($dom, $spreadsheet);
@@ -699,7 +699,7 @@ 
             return;
         }
 
-        $cellStyle = $sheet->getStyle($column . $row);
+        $cellStyle = $sheet->getStyle($column.$row);
 
         // add color styles (background & text) from dom element,currently support : td & th, using ONLY inline css style with RGB color
         $styles = explode(';', $attributeArray['style']);
@@ -879,7 +879,7 @@ 
         $drawing = new Drawing();
         $drawing->setPath($src);
         $drawing->setWorksheet($sheet);
-        $drawing->setCoordinates($column . $row);
+        $drawing->setCoordinates($column.$row);
         $drawing->setOffsetX(0);
         $drawing->setOffsetY(10);
         $drawing->setResizeProportional(true);

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php

Spacing +9 added lines, -9 removed lines

@@ -115,7 +115,7 @@ 
     {
         // Open file
         if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+            throw new Exception($pFilename.' is an Invalid Spreadsheet file.');
         }
         $this->openFile($pFilename);
         $fileHandle = $this->fileHandle;
@@ -204,7 +204,7 @@ 
     {
         // Open file
         if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+            throw new Exception($pFilename.' is an Invalid Spreadsheet file.');
         }
         $this->openFile($pFilename);
         $fileHandle = $this->fileHandle;
@@ -285,7 +285,7 @@ 
                             break;
                     }
                 }
-                $this->formats['P' . $this->format++] = $formatArray;
+                $this->formats['P'.$this->format++] = $formatArray;
             //    Read cell value data
             } elseif ($dataType == 'C') {
                 $hasCalculatedValue = false;
@@ -307,7 +307,7 @@ 
 
                             break;
                         case 'E':
-                            $cellDataFormula = '=' . substr($rowDatum, 1);
+                            $cellDataFormula = '='.substr($rowDatum, 1);
                             //    Convert R1C1 style references to A1 style references (but only when not quoted)
                             $temp = explode('"', $cellDataFormula);
                             $key = false;
@@ -340,7 +340,7 @@ 
                                         if ($columnReference[0] == '[') {
                                             $columnReference = $column + trim($columnReference, '[]');
                                         }
-                                        $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
+                                        $A1CellReference = Coordinate::stringFromColumnIndex($columnReference).$rowReference;
 
                                         $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
                                     }
@@ -358,10 +358,10 @@ 
                 $cellData = Calculation::unwrapResult($cellData);
 
                 // Set cell value
-                $spreadsheet->getActiveSheet()->getCell($columnLetter . $row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
+                $spreadsheet->getActiveSheet()->getCell($columnLetter.$row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
                 if ($hasCalculatedValue) {
                     $cellData = Calculation::unwrapResult($cellData);
-                    $spreadsheet->getActiveSheet()->getCell($columnLetter . $row)->setCalculatedValue($cellData);
+                    $spreadsheet->getActiveSheet()->getCell($columnLetter.$row)->setCalculatedValue($cellData);
                 }
                 //    Read cell formatting
             } elseif ($dataType == 'F') {
@@ -425,12 +425,12 @@ 
                 if (($formatStyle > '') && ($column > '') && ($row > '')) {
                     $columnLetter = Coordinate::stringFromColumnIndex($column);
                     if (isset($this->formats[$formatStyle])) {
-                        $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($this->formats[$formatStyle]);
+                        $spreadsheet->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($this->formats[$formatStyle]);
                     }
                 }
                 if ((!empty($styleData)) && ($column > '') && ($row > '')) {
                     $columnLetter = Coordinate::stringFromColumnIndex($column);
-                    $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($styleData);
+                    $spreadsheet->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($styleData);
                 }
                 if ($columnWidth > '') {
                     if ($startCol == $endCol) {

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php

Spacing +6 added lines, -6 removed lines

@@ -131,7 +131,7 @@ 
         unset($this->index[$pCoord]);
 
         // Delete the entry from cache
-        $this->cache->delete($this->cachePrefix . $pCoord);
+        $this->cache->delete($this->cachePrefix.$pCoord);
     }
 
     /**
@@ -178,7 +178,7 @@ 
             $r = 0;
             sscanf($coord, '%[A-Z]%d', $c, $r);
             $row[$r] = $r;
-            $col[$c] = strlen($c) . $c;
+            $col[$c] = strlen($c).$c;
         }
 
         // Determine highest column and row
@@ -300,7 +300,7 @@ 
      */
     private function getUniqueID()
     {
-        return uniqid('phpspreadsheet.', true) . '.';
+        return uniqid('phpspreadsheet.', true).'.';
     }
 
     /**
@@ -390,7 +390,7 @@ 
         if ($this->currentCellIsDirty && !empty($this->currentCoordinate)) {
             $this->currentCell->detach();
 
-            $stored = $this->cache->set($this->cachePrefix . $this->currentCoordinate, $this->currentCell);
+            $stored = $this->cache->set($this->cachePrefix.$this->currentCoordinate, $this->currentCell);
             if (!$stored) {
                 $this->__destruct();
 
@@ -449,7 +449,7 @@ 
         }
 
         // Check if the entry that has been requested actually exists
-        $cell = $this->cache->get($this->cachePrefix . $pCoord);
+        $cell = $this->cache->get($this->cachePrefix.$pCoord);
         if ($cell === null) {
             throw new PhpSpreadsheetException("Cell entry {$pCoord} no longer exists in cache. This probably means that the cache was cleared by someone else.");
         }
@@ -500,7 +500,7 @@ 
     private function getAllCacheKeys()
     {
         foreach ($this->getCoordinates() as $coordinate) {
-            yield $this->cachePrefix . $coordinate;
+            yield $this->cachePrefix.$coordinate;
         }
     }
 }

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

Spacing +2 added lines, -2 removed lines

@@ -205,7 +205,7 @@ 
     public static function registerWriter($writerType, $writerClass)
     {
         if (!is_a($writerClass, Writer\IWriter::class, true)) {
-            throw new Writer\Exception('Registered writers must implement ' . Writer\IWriter::class);
+            throw new Writer\Exception('Registered writers must implement '.Writer\IWriter::class);
         }
 
         self::$writers[$writerType] = $writerClass;
@@ -220,7 +220,7 @@ 
     public static function registerReader($readerType, $readerClass)
     {
         if (!is_a($readerClass, Reader\IReader::class, true)) {
-            throw new Reader\Exception('Registered readers must implement ' . Reader\IReader::class);
+            throw new Reader\Exception('Registered readers must implement '.Reader\IReader::class);
         }
 
         self::$readers[$readerType] = $readerClass;