Dolibarr / dolibarr

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

Spacing +11 added lines, -11 removed lines

@@ -116,7 +116,7 @@ 
                 Settings::getLibXmlLoaderOptions()
             );
         } catch (\Exception $e) {
-            throw new Exception('Cannot load invalid XML file: ' . $pFilename, 0, $e);
+            throw new Exception('Cannot load invalid XML file: '.$pFilename, 0, $e);
         }
 
         return $xml;
@@ -135,7 +135,7 @@ 
     {
         File::assertFile($pFilename);
         if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+            throw new Exception($pFilename.' is an Invalid Spreadsheet file.');
         }
 
         $worksheetNames = [];
@@ -308,7 +308,7 @@ 
     {
         File::assertFile($pFilename);
         if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+            throw new Exception($pFilename.' is an Invalid Spreadsheet file.');
         }
 
         $xml = $this->trySimpleXMLLoadString($pFilename);
@@ -459,7 +459,7 @@ 
                         if (isset($cell_ss['Index'])) {
                             $columnID = Coordinate::stringFromColumnIndex((int) $cell_ss['Index']);
                         }
-                        $cellRange = $columnID . $rowID;
+                        $cellRange = $columnID.$rowID;
 
                         if ($this->getReadFilter() !== null) {
                             if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
@@ -483,7 +483,7 @@ 
                             if (isset($cell_ss['MergeDown'])) {
                                 $rowTo = $rowTo + $cell_ss['MergeDown'];
                             }
-                            $cellRange .= ':' . $columnTo . $rowTo;
+                            $cellRange .= ':'.$columnTo.$rowTo;
                             $spreadsheet->getActiveSheet()->mergeCells($cellRange);
                         }
 
@@ -585,7 +585,7 @@ 
                                                 if ($columnReference[0] == '[') {
                                                     $columnReference = $columnNumber + trim($columnReference, '[]');
                                                 }
-                                                $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
+                                                $A1CellReference = Coordinate::stringFromColumnIndex($columnReference).$rowReference;
                                                 $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
                                             }
                                         }
@@ -596,9 +596,9 @@ 
                                 $cellDataFormula = implode('"', $temp);
                             }
 
-                            $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
+                            $spreadsheet->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
                             if ($hasCalculatedValue) {
-                                $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setCalculatedValue($cellValue);
+                                $spreadsheet->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($cellValue);
                             }
                             $cellIsSet = $rowHasData = true;
                         }
@@ -611,14 +611,14 @@ 
                             }
                             $node = $cell->Comment->Data->asXML();
                             $annotation = strip_tags($node);
-                            $spreadsheet->getActiveSheet()->getComment($columnID . $rowID)->setAuthor(self::convertStringEncoding($author, $this->charSet))->setText($this->parseRichText($annotation));
+                            $spreadsheet->getActiveSheet()->getComment($columnID.$rowID)->setAuthor(self::convertStringEncoding($author, $this->charSet))->setText($this->parseRichText($annotation));
                         }
 
                         if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
                             $style = (string) $cell_ss['StyleID'];
                             if ((isset($this->styles[$style])) && (!empty($this->styles[$style]))) {
-                                if (!$spreadsheet->getActiveSheet()->cellExists($columnID . $rowID)) {
-                                    $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValue(null);
+                                if (!$spreadsheet->getActiveSheet()->cellExists($columnID.$rowID)) {
+                                    $spreadsheet->getActiveSheet()->getCell($columnID.$rowID)->setValue(null);
                                 }
                                 $spreadsheet->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styles[$style]);
                             }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
         }
 
         $this->worksheet->freezePane(
-            Coordinate::stringFromColumnIndex($xSplit + 1) . ($ySplit + 1),
+            Coordinate::stringFromColumnIndex($xSplit + 1).($ySplit + 1),
             $topLeftCell
         );
     }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
         foreach ($xmlSheet->colBreaks->brk as $brk) {
             if ($brk['man']) {
                 $worksheet->setBreak(
-                    Coordinate::stringFromColumnIndex(((int) $brk['id']) + 1) . '1',
+                    Coordinate::stringFromColumnIndex(((int) $brk['id']) + 1).'1',
                     Worksheet::BREAK_COLUMN
                 );
             }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php

Spacing +2 added lines, -2 removed lines

@@ -42,11 +42,11 @@
             if (isset($linkRel['id'])) {
                 $hyperlinkUrl = $this->hyperlinks[(string) $linkRel['id']];
                 if (isset($hyperlink['location'])) {
-                    $hyperlinkUrl .= '#' . (string) $hyperlink['location'];
+                    $hyperlinkUrl .= '#'.(string) $hyperlink['location'];
                 }
                 $cell->getHyperlink()->setUrl($hyperlinkUrl);
             } elseif (isset($hyperlink['location'])) {
-                $cell->getHyperlink()->setUrl('sheet://' . (string) $hyperlink['location']);
+                $cell->getHyperlink()->setUrl('sheet://'.(string) $hyperlink['location']);
             }
 
             // Tooltip

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php

Spacing +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
                     $returnColour = Color::changeBrightness($returnColour, $tintAdjust);
                 }
 
-                return 'FF' . $returnColour;
+                return 'FF'.$returnColour;
             }
         }
 

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

Spacing +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
         // Open file
         $this->fileHandle = fopen($pFilename, 'r');
         if ($this->fileHandle === false) {
-            throw new Exception('Could not open file ' . $pFilename . ' for reading.');
+            throw new Exception('Could not open file '.$pFilename.' for reading.');
         }
     }
 }

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

Spacing +37 added lines, -37 removed lines

@@ -166,7 +166,7 @@ 
                 //~ http://schemas.openxmlformats.org/package/2006/relationships"
                 $relsWorkbook = simplexml_load_string(
                     $this->securityScanner->scan(
-                        $this->getFromZipArchive($zip, "$dir/_rels/" . basename($rel['Target']) . '.rels')
+                        $this->getFromZipArchive($zip, "$dir/_rels/".basename($rel['Target']).'.rels')
                     ),
                     'SimpleXMLElement',
                     Settings::getLibXmlLoaderOptions()
@@ -205,7 +205,7 @@ 
                         $xml = new XMLReader();
                         $xml->xml(
                             $this->securityScanner->scanFile(
-                                'zip://' . File::realpath($pFilename) . '#' . "$dir/$fileWorksheet"
+                                'zip://'.File::realpath($pFilename).'#'."$dir/$fileWorksheet"
                             ),
                             null,
                             Settings::getLibXmlLoaderOptions()
@@ -421,7 +421,7 @@ 
                     $dir = dirname($rel['Target']);
                     //~ http://schemas.openxmlformats.org/package/2006/relationships"
                     $relsWorkbook = simplexml_load_string(
-                        $this->securityScanner->scan($this->getFromZipArchive($zip, "$dir/_rels/" . basename($rel['Target']) . '.rels')),
+                        $this->securityScanner->scan($this->getFromZipArchive($zip, "$dir/_rels/".basename($rel['Target']).'.rels')),
                         'SimpleXMLElement',
                         Settings::getLibXmlLoaderOptions()
                     );
@@ -655,7 +655,7 @@ 
                                     foreach ($row->c as $c) {
                                         $r = (string) $c['r'];
                                         if ($r == '') {
-                                            $r = Coordinate::stringFromColumnIndex($rowIndex) . $cIndex;
+                                            $r = Coordinate::stringFromColumnIndex($rowIndex).$cIndex;
                                         }
                                         $cellDataType = (string) $c['t'];
                                         $value = null;
@@ -765,7 +765,7 @@ 
                             $aKeys = ['sheet', 'objects', 'scenarios', 'formatCells', 'formatColumns', 'formatRows', 'insertColumns', 'insertRows', 'insertHyperlinks', 'deleteColumns', 'deleteRows', 'selectLockedCells', 'sort', 'autoFilter', 'pivotTables', 'selectUnlockedCells'];
                             if (!$this->readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
                                 foreach ($aKeys as $key) {
-                                    $method = 'set' . ucfirst($key);
+                                    $method = 'set'.ucfirst($key);
                                     $docSheet->getProtection()->$method(self::boolean((string) $xmlSheet->sheetProtection[$key]));
                                 }
                             }
@@ -814,7 +814,7 @@ 
                             if (!$this->readDataOnly) {
                                 $hyperlinkReader = new Hyperlinks($docSheet);
                                 // Locate hyperlink relations
-                                $relationsFileName = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
+                                $relationsFileName = dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels';
                                 if ($zip->locateName($relationsFileName)) {
                                     //~ http://schemas.openxmlformats.org/package/2006/relationships"
                                     $relsWorksheet = simplexml_load_string(
@@ -838,11 +838,11 @@ 
                             $vmlComments = [];
                             if (!$this->readDataOnly) {
                                 // Locate comment relations
-                                if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
+                                if ($zip->locateName(dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels')) {
                                     //~ http://schemas.openxmlformats.org/package/2006/relationships"
                                     $relsWorksheet = simplexml_load_string(
                                         $this->securityScanner->scan(
-                                            $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
+                                            $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels')
                                         ),
                                         'SimpleXMLElement',
                                         Settings::getLibXmlLoaderOptions()
@@ -860,7 +860,7 @@ 
                                 // Loop through comments
                                 foreach ($comments as $relName => $relPath) {
                                     // Load comments file
-                                    $relPath = File::realpath(dirname("$dir/$fileWorksheet") . '/' . $relPath);
+                                    $relPath = File::realpath(dirname("$dir/$fileWorksheet").'/'.$relPath);
                                     $commentsFile = simplexml_load_string(
                                         $this->securityScanner->scan($this->getFromZipArchive($zip, $relPath)),
                                         'SimpleXMLElement',
@@ -890,7 +890,7 @@ 
                                 // Loop through VML comments
                                 foreach ($vmlComments as $relName => $relPath) {
                                     // Load VML comments file
-                                    $relPath = File::realpath(dirname("$dir/$fileWorksheet") . '/' . $relPath);
+                                    $relPath = File::realpath(dirname("$dir/$fileWorksheet").'/'.$relPath);
 
                                     try {
                                         $vmlCommentsFile = simplexml_load_string(
@@ -979,11 +979,11 @@ 
 
                                 // Header/footer images
                                 if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->readDataOnly) {
-                                    if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
+                                    if ($zip->locateName(dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels')) {
                                         //~ http://schemas.openxmlformats.org/package/2006/relationships"
                                         $relsWorksheet = simplexml_load_string(
                                             $this->securityScanner->scan(
-                                                $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
+                                                $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels')
                                             ),
                                             'SimpleXMLElement',
                                             Settings::getLibXmlLoaderOptions()
@@ -1001,7 +1001,7 @@ 
                                             //~ http://schemas.openxmlformats.org/package/2006/relationships"
                                             $relsVML = simplexml_load_string(
                                                 $this->securityScanner->scan(
-                                                    $this->getFromZipArchive($zip, dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels')
+                                                    $this->getFromZipArchive($zip, dirname($vmlRelationship).'/_rels/'.basename($vmlRelationship).'.rels')
                                                 ),
                                                 'SimpleXMLElement',
                                                 Settings::getLibXmlLoaderOptions()
@@ -1042,7 +1042,7 @@ 
                                                     $hfImages[(string) $shape['id']]->setName((string) $imageData['title']);
                                                 }
 
-                                                $hfImages[(string) $shape['id']]->setPath('zip://' . File::realpath($pFilename) . '#' . $drawings[(string) $imageData['relid']], false);
+                                                $hfImages[(string) $shape['id']]->setPath('zip://'.File::realpath($pFilename).'#'.$drawings[(string) $imageData['relid']], false);
                                                 $hfImages[(string) $shape['id']]->setResizeProportional(false);
                                                 $hfImages[(string) $shape['id']]->setWidth($style['width']);
                                                 $hfImages[(string) $shape['id']]->setHeight($style['height']);
@@ -1060,11 +1060,11 @@ 
                             }
 
                             // TODO: Autoshapes from twoCellAnchors!
-                            if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
+                            if ($zip->locateName(dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels')) {
                                 //~ http://schemas.openxmlformats.org/package/2006/relationships"
                                 $relsWorksheet = simplexml_load_string(
                                     $this->securityScanner->scan(
-                                        $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
+                                        $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels')
                                     ),
                                     'SimpleXMLElement',
                                     Settings::getLibXmlLoaderOptions()
@@ -1083,7 +1083,7 @@ 
                                         //~ http://schemas.openxmlformats.org/package/2006/relationships"
                                         $relsDrawing = simplexml_load_string(
                                             $this->securityScanner->scan(
-                                                $this->getFromZipArchive($zip, dirname($fileDrawing) . '/_rels/' . basename($fileDrawing) . '.rels')
+                                                $this->getFromZipArchive($zip, dirname($fileDrawing).'/_rels/'.basename($fileDrawing).'.rels')
                                             ),
                                             'SimpleXMLElement',
                                             Settings::getLibXmlLoaderOptions()
@@ -1130,14 +1130,14 @@ 
                                                     $objDrawing->setName((string) self::getArrayItem($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'name'));
                                                     $objDrawing->setDescription((string) self::getArrayItem($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'descr'));
                                                     $objDrawing->setPath(
-                                                        'zip://' . File::realpath($pFilename) . '#' .
+                                                        'zip://'.File::realpath($pFilename).'#'.
                                                         $images[(string) self::getArrayItem(
                                                             $blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
                                                             'embed'
                                                         )],
                                                         false
                                                     );
-                                                    $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((string) $oneCellAnchor->from->col) + 1) . ($oneCellAnchor->from->row + 1));
+                                                    $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((string) $oneCellAnchor->from->col) + 1).($oneCellAnchor->from->row + 1));
                                                     $objDrawing->setOffsetX(Drawing::EMUToPixels($oneCellAnchor->from->colOff));
                                                     $objDrawing->setOffsetY(Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
                                                     $objDrawing->setResizeProportional(false);
@@ -1163,7 +1163,7 @@ 
                                                     $objDrawing->setWorksheet($docSheet);
                                                 } else {
                                                     //    ? Can charts be positioned with a oneCellAnchor ?
-                                                    $coordinates = Coordinate::stringFromColumnIndex(((string) $oneCellAnchor->from->col) + 1) . ($oneCellAnchor->from->row + 1);
+                                                    $coordinates = Coordinate::stringFromColumnIndex(((string) $oneCellAnchor->from->col) + 1).($oneCellAnchor->from->row + 1);
                                                     $offsetX = Drawing::EMUToPixels($oneCellAnchor->from->colOff);
                                                     $offsetY = Drawing::EMUToPixels($oneCellAnchor->from->rowOff);
                                                     $width = Drawing::EMUToPixels(self::getArrayItem($oneCellAnchor->ext->attributes(), 'cx'));
@@ -1182,14 +1182,14 @@ 
                                                     $objDrawing->setName((string) self::getArrayItem($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'name'));
                                                     $objDrawing->setDescription((string) self::getArrayItem($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'descr'));
                                                     $objDrawing->setPath(
-                                                        'zip://' . File::realpath($pFilename) . '#' .
+                                                        'zip://'.File::realpath($pFilename).'#'.
                                                         $images[(string) self::getArrayItem(
                                                             $blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
                                                             'embed'
                                                         )],
                                                         false
                                                     );
-                                                    $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((string) $twoCellAnchor->from->col) + 1) . ($twoCellAnchor->from->row + 1));
+                                                    $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((string) $twoCellAnchor->from->col) + 1).($twoCellAnchor->from->row + 1));
                                                     $objDrawing->setOffsetX(Drawing::EMUToPixels($twoCellAnchor->from->colOff));
                                                     $objDrawing->setOffsetY(Drawing::EMUToPixels($twoCellAnchor->from->rowOff));
                                                     $objDrawing->setResizeProportional(false);
@@ -1215,10 +1215,10 @@ 
 
                                                     $objDrawing->setWorksheet($docSheet);
                                                 } elseif (($this->includeCharts) && ($twoCellAnchor->graphicFrame)) {
-                                                    $fromCoordinate = Coordinate::stringFromColumnIndex(((string) $twoCellAnchor->from->col) + 1) . ($twoCellAnchor->from->row + 1);
+                                                    $fromCoordinate = Coordinate::stringFromColumnIndex(((string) $twoCellAnchor->from->col) + 1).($twoCellAnchor->from->row + 1);
                                                     $fromOffsetX = Drawing::EMUToPixels($twoCellAnchor->from->colOff);
                                                     $fromOffsetY = Drawing::EMUToPixels($twoCellAnchor->from->rowOff);
-                                                    $toCoordinate = Coordinate::stringFromColumnIndex(((string) $twoCellAnchor->to->col) + 1) . ($twoCellAnchor->to->row + 1);
+                                                    $toCoordinate = Coordinate::stringFromColumnIndex(((string) $twoCellAnchor->to->col) + 1).($twoCellAnchor->to->row + 1);
                                                     $toOffsetX = Drawing::EMUToPixels($twoCellAnchor->to->colOff);
                                                     $toOffsetY = Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
                                                     $graphic = $twoCellAnchor->graphicFrame->children('http://schemas.openxmlformats.org/drawingml/2006/main')->graphic;
@@ -1226,7 +1226,7 @@ 
                                                     $chartRef = $graphic->graphicData->children('http://schemas.openxmlformats.org/drawingml/2006/chart')->chart;
                                                     $thisChart = (string) $chartRef->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
 
-                                                    $chartDetails[$docSheet->getTitle() . '!' . $thisChart] = [
+                                                    $chartDetails[$docSheet->getTitle().'!'.$thisChart] = [
                                                         'fromCoordinate' => $fromCoordinate,
                                                         'fromOffsetX' => $fromOffsetX,
                                                         'fromOffsetY' => $fromOffsetY,
@@ -1280,7 +1280,7 @@ 
                                     // Extract range
                                     $extractedRange = (string) $definedName;
                                     if (($spos = strpos($extractedRange, '!')) !== false) {
-                                        $extractedRange = substr($extractedRange, 0, $spos) . str_replace('$', '', substr($extractedRange, $spos));
+                                        $extractedRange = substr($extractedRange, 0, $spos).str_replace('$', '', substr($extractedRange, $spos));
                                     } else {
                                         $extractedRange = str_replace('$', '', $extractedRange);
                                     }
@@ -1331,7 +1331,7 @@ 
                                                 foreach ($rangeSets as $rangeSet) {
                                                     [$sheetName, $rangeSet] = Worksheet::extractSheetTitle($rangeSet, true);
                                                     if (strpos($rangeSet, ':') === false) {
-                                                        $rangeSet = $rangeSet . ':' . $rangeSet;
+                                                        $rangeSet = $rangeSet.':'.$rangeSet;
                                                     }
                                                     $newRangeSets[] = str_replace('$', '', $rangeSet);
                                                 }
@@ -1355,7 +1355,7 @@ 
                                 // Extract range
                                 $extractedRange = (string) $definedName;
                                 if (($spos = strpos($extractedRange, '!')) !== false) {
-                                    $extractedRange = substr($extractedRange, 0, $spos) . str_replace('$', '', substr($extractedRange, $spos));
+                                    $extractedRange = substr($extractedRange, 0, $spos).str_replace('$', '', substr($extractedRange, $spos));
                                 } else {
                                     $extractedRange = str_replace('$', '', $extractedRange);
                                 }
@@ -1510,7 +1510,7 @@ 
                             $objChart = Chart::readChart($chartElements, basename($chartEntryRef, '.xml'));
 
                             if (isset($charts[$chartEntryRef])) {
-                                $chartPositionRef = $charts[$chartEntryRef]['sheet'] . '!' . $charts[$chartEntryRef]['id'];
+                                $chartPositionRef = $charts[$chartEntryRef]['sheet'].'!'.$charts[$chartEntryRef]['id'];
                                 if (isset($chartDetails[$chartPositionRef])) {
                                     $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
                                     $objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
@@ -1552,7 +1552,7 @@ 
                     $returnColour = Color::changeBrightness($returnColour, $tintAdjust);
                 }
 
-                return 'FF' . $returnColour;
+                return 'FF'.$returnColour;
             }
         }
 
@@ -1781,7 +1781,7 @@ 
         $customUIImagesNames = [];
         $customUIImagesBinaries = [];
         // something like customUI/_rels/customUI.xml.rels
-        $pathRels = $baseDir . '/_rels/' . $nameCustomUI . '.rels';
+        $pathRels = $baseDir.'/_rels/'.$nameCustomUI.'.rels';
         $dataRels = $this->getFromZipArchive($zip, $pathRels);
         if ($dataRels) {
             // exists and not empty if the ribbon have some pictures (other than internal MSO)
@@ -1796,7 +1796,7 @@ 
                     if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
                         // an image ?
                         $customUIImagesNames[(string) $ele['Id']] = (string) $ele['Target'];
-                        $customUIImagesBinaries[(string) $ele['Target']] = $this->getFromZipArchive($zip, $baseDir . '/' . (string) $ele['Target']);
+                        $customUIImagesBinaries[(string) $ele['Target']] = $this->getFromZipArchive($zip, $baseDir.'/'.(string) $ele['Target']);
                     }
                 }
             }
@@ -1821,7 +1821,7 @@ 
 
     private static function dirAdd($base, $add)
     {
-        return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
+        return preg_replace('~[^/]+/\.\./~', '', dirname($base)."/$add");
     }
 
     private static function toCSSArray($style)
@@ -1922,14 +1922,14 @@ 
 
     private function readFormControlProperties(Spreadsheet $excel, ZipArchive $zip, $dir, $fileWorksheet, $docSheet, array &$unparsedLoadedData)
     {
-        if (!$zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
+        if (!$zip->locateName(dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels')) {
             return;
         }
 
         //~ http://schemas.openxmlformats.org/package/2006/relationships"
         $relsWorksheet = simplexml_load_string(
             $this->securityScanner->scan(
-                $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
+                $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels')
             ),
             'SimpleXMLElement',
             Settings::getLibXmlLoaderOptions()
@@ -1954,14 +1954,14 @@ 
 
     private function readPrinterSettings(Spreadsheet $excel, ZipArchive $zip, $dir, $fileWorksheet, $docSheet, array &$unparsedLoadedData)
     {
-        if (!$zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
+        if (!$zip->locateName(dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels')) {
             return;
         }
 
         //~ http://schemas.openxmlformats.org/package/2006/relationships"
         $relsWorksheet = simplexml_load_string(
             $this->securityScanner->scan(
-                $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
+                $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet").'/_rels/'.basename($fileWorksheet).'.rels')
             ),
             'SimpleXMLElement',
             Settings::getLibXmlLoaderOptions()

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