Dolibarr / dolibarr

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

Spacing +6 added lines, -6 removed lines

@@ -837,7 +837,7 @@ 
             return $worksheet;
         }
 
-        throw new Exception('Workbook does not contain sheet:' . $pValue);
+        throw new Exception('Workbook does not contain sheet:'.$pValue);
     }
 
     /**
@@ -916,7 +916,7 @@ 
             $this->namedRanges[$namedRange->getName()] = $namedRange;
         } else {
             // local scope
-            $this->namedRanges[$namedRange->getScope()->getTitle() . '!' . $namedRange->getName()] = $namedRange;
+            $this->namedRanges[$namedRange->getScope()->getTitle().'!'.$namedRange->getName()] = $namedRange;
         }
 
         return true;
@@ -941,8 +941,8 @@ 
             }
 
             // then look for local defined name (has priority over global defined name if both names exist)
-            if (($pSheet !== null) && isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-                $returnValue = $this->namedRanges[$pSheet->getTitle() . '!' . $namedRange];
+            if (($pSheet !== null) && isset($this->namedRanges[$pSheet->getTitle().'!'.$namedRange])) {
+                $returnValue = $this->namedRanges[$pSheet->getTitle().'!'.$namedRange];
             }
         }
 
@@ -964,8 +964,8 @@ 
                 unset($this->namedRanges[$namedRange]);
             }
         } else {
-            if (isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-                unset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange]);
+            if (isset($this->namedRanges[$pSheet->getTitle().'!'.$namedRange])) {
+                unset($this->namedRanges[$pSheet->getTitle().'!'.$namedRange]);
             }
         }
 

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php

Spacing +5 added lines, -5 removed lines

@@ -414,7 +414,7 @@ 
                 }
             } else {
                 //    String values are always tested for equality, factoring in for wildcards (hence a regexp test)
-                $retVal = preg_match('/^' . $rule['value'] . '$/i', $cellValue);
+                $retVal = preg_match('/^'.$rule['value'].'$/i', $cellValue);
             }
             //    If there are multiple conditions, then we need to test both using the appropriate join operator
             switch ($join) {
@@ -599,7 +599,7 @@ 
 
     private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue)
     {
-        $range = $columnID . $startRow . ':' . $columnID . $endRow;
+        $range = $columnID.$startRow.':'.$columnID.$endRow;
         $dataValues = Functions::flattenArray($this->workSheet->rangeToArray($range, null, true, false));
 
         $dataValues = array_filter($dataValues);
@@ -683,7 +683,7 @@ 
                                 ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')) {
                                 $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
                             }
-                            $dateTime = $date . $time;
+                            $dateTime = $date.$time;
                             $arguments['date'][] = $date;
                             $arguments['time'][] = $time;
                             $arguments['dateTime'][] = $dateTime;
@@ -732,7 +732,7 @@ 
                             ($dynamicRuleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) {
                             //    Number (Average) based
                             //    Calculate the average
-                            $averageFormula = '=AVERAGE(' . $columnID . ($rangeStart[1] + 1) . ':' . $columnID . $rangeEnd[1] . ')';
+                            $averageFormula = '=AVERAGE('.$columnID.($rangeStart[1] + 1).':'.$columnID.$rangeEnd[1].')';
                             $average = Calculation::getInstance()->calculateFormula($averageFormula, null, $this->workSheet->getCell('A1'));
                             //    Set above/below rule based on greaterThan or LessTan
                             $operator = ($dynamicRuleType === AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
@@ -815,7 +815,7 @@ 
         for ($row = $rangeStart[1] + 1; $row <= $rangeEnd[1]; ++$row) {
             $result = true;
             foreach ($columnFilterTests as $columnID => $columnFilterTest) {
-                $cellValue = $this->workSheet->getCell($columnID . $row)->getCalculatedValue();
+                $cellValue = $this->workSheet->getCell($columnID.$row)->getCalculatedValue();
                 //    Execute the filter test
                 $result = $result &&
                     call_user_func_array(

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
         $fileName = $this->getFilename();
         $fileName = str_replace(' ', '_', $fileName);
 
-        return str_replace('.' . $this->getExtension(), '', $fileName) . $this->getImageIndex() . '.' . $this->getExtension();
+        return str_replace('.'.$this->getExtension(), '', $fileName).$this->getImageIndex().'.'.$this->getExtension();
     }
 
     /**
@@ -108,8 +108,8 @@ 
     public function getHashCode()
     {
         return md5(
-            $this->path .
-            parent::getHashCode() .
+            $this->path.
+            parent::getHashCode().
             __CLASS__
         );
     }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php

Spacing +6 added lines, -6 removed lines

@@ -53,7 +53,7 @@ 
         $this->imageResource = null;
         $this->renderingFunction = self::RENDERING_DEFAULT;
         $this->mimeType = self::MIMETYPE_DEFAULT;
-        $this->uniqueName = md5(rand(0, 9999) . time() . rand(0, 9999));
+        $this->uniqueName = md5(rand(0, 9999).time().rand(0, 9999));
 
         // Initialize parent
         parent::__construct();
@@ -148,7 +148,7 @@ 
         $extension = explode('/', $extension);
         $extension = $extension[1];
 
-        return $this->uniqueName . $this->getImageIndex() . '.' . $extension;
+        return $this->uniqueName.$this->getImageIndex().'.'.$extension;
     }
 
     /**
@@ -159,10 +159,10 @@ 
     public function getHashCode()
     {
         return md5(
-            $this->renderingFunction .
-            $this->mimeType .
-            $this->uniqueName .
-            parent::getHashCode() .
+            $this->renderingFunction.
+            $this->mimeType.
+            $this->uniqueName.
+            parent::getHashCode().
             __CLASS__
         );
     }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php

Spacing +6 added lines, -6 removed lines

@@ -12,12 +12,12 @@
     public function getHashCode()
     {
         return md5(
-            $this->getPath() .
-            $this->name .
-            $this->offsetX .
-            $this->offsetY .
-            $this->width .
-            $this->height .
+            $this->getPath().
+            $this->name.
+            $this->offsetX.
+            $this->offsetY.
+            $this->width.
+            $this->height.
             __CLASS__
         );
     }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php

Spacing +7 added lines, -7 removed lines

@@ -261,13 +261,13 @@
     public function getHashCode()
     {
         return md5(
-            ($this->visible ? 't' : 'f') .
-            $this->blurRadius .
-            $this->distance .
-            $this->direction .
-            $this->alignment .
-            $this->color->getHashCode() .
-            $this->alpha .
+            ($this->visible ? 't' : 'f').
+            $this->blurRadius.
+            $this->distance.
+            $this->direction.
+            $this->alignment.
+            $this->color->getHashCode().
+            $this->alpha.
             __CLASS__
         );
     }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php

Spacing +3 added lines, -3 removed lines

@@ -700,7 +700,7 @@ 
             }
         } elseif ($method == self::SETPRINTRANGE_INSERT) {
             if ($index == 0) {
-                $this->printArea .= ($this->printArea == '') ? $value : ',' . $value;
+                $this->printArea .= ($this->printArea == '') ? $value : ','.$value;
             } else {
                 $printAreas = explode(',', $this->printArea);
                 if ($index < 0) {
@@ -767,7 +767,7 @@ 
     public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
     {
         return $this->setPrintArea(
-            Coordinate::stringFromColumnIndex($column1) . $row1 . ':' . Coordinate::stringFromColumnIndex($column2) . $row2,
+            Coordinate::stringFromColumnIndex($column1).$row1.':'.Coordinate::stringFromColumnIndex($column2).$row2,
             $index,
             $method
         );
@@ -794,7 +794,7 @@ 
     public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
     {
         return $this->setPrintArea(
-            Coordinate::stringFromColumnIndex($column1) . $row1 . ':' . Coordinate::stringFromColumnIndex($column2) . $row2,
+            Coordinate::stringFromColumnIndex($column1).$row1.':'.Coordinate::stringFromColumnIndex($column2).$row2,
             $index,
             self::SETPRINTRANGE_INSERT
         );

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

Spacing +46 added lines, -46 removed lines

@@ -443,7 +443,7 @@ 
 
         // Enforce maximum characters allowed for sheet title
         if ($CharCount > self::SHEET_TITLE_MAXIMUM_LENGTH) {
-            throw new Exception('Maximum ' . self::SHEET_TITLE_MAXIMUM_LENGTH . ' characters allowed in sheet code name.');
+            throw new Exception('Maximum '.self::SHEET_TITLE_MAXIMUM_LENGTH.' characters allowed in sheet code name.');
         }
 
         return $pValue;
@@ -467,7 +467,7 @@ 
 
         // Enforce maximum characters allowed for sheet title
         if (Shared\StringHelper::countCharacters($pValue) > self::SHEET_TITLE_MAXIMUM_LENGTH) {
-            throw new Exception('Maximum ' . self::SHEET_TITLE_MAXIMUM_LENGTH . ' characters allowed in sheet title.');
+            throw new Exception('Maximum '.self::SHEET_TITLE_MAXIMUM_LENGTH.' characters allowed in sheet title.');
         }
 
         return $pValue;
@@ -690,7 +690,7 @@ 
     public function calculateWorksheetDimension()
     {
         // Return
-        return 'A1:' . $this->getHighestColumn() . $this->getHighestRow();
+        return 'A1:'.$this->getHighestColumn().$this->getHighestRow();
     }
 
     /**
@@ -701,7 +701,7 @@ 
     public function calculateWorksheetDataDimension()
     {
         // Return
-        return 'A1:' . $this->getHighestDataColumn() . $this->getHighestDataRow();
+        return 'A1:'.$this->getHighestDataColumn().$this->getHighestDataRow();
     }
 
     /**
@@ -863,7 +863,7 @@ 
                         $pValue = Shared\StringHelper::substring($pValue, 0, 29);
                     }
                     $i = 1;
-                    while ($this->parent->sheetNameExists($pValue . ' ' . $i)) {
+                    while ($this->parent->sheetNameExists($pValue.' '.$i)) {
                         ++$i;
                         if ($i == 10) {
                             if (Shared\StringHelper::countCharacters($pValue) > 28) {
@@ -1207,8 +1207,8 @@ 
         }
 
         // Named range?
-        if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) &&
-            (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))) {
+        if ((!preg_match('/^'.Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
+            (preg_match('/^'.Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
             $namedRange = NamedRange::resolveRange($pCoordinate, $this);
             if ($namedRange !== null) {
                 $pCoordinate = $namedRange->getRange();
@@ -1240,7 +1240,7 @@ 
     public function getCellByColumnAndRow($columnIndex, $row, $createIfNotExists = true)
     {
         $columnLetter = Coordinate::stringFromColumnIndex($columnIndex);
-        $coordinate = $columnLetter . $row;
+        $coordinate = $columnLetter.$row;
 
         if ($this->cellCollection->has($coordinate)) {
             return $this->cellCollection->get($coordinate);
@@ -1307,8 +1307,8 @@ 
         }
 
         // Named range?
-        if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) &&
-            (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))) {
+        if ((!preg_match('/^'.Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
+            (preg_match('/^'.Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
             $namedRange = NamedRange::resolveRange($pCoordinate, $this);
             if ($namedRange !== null) {
                 $pCoordinate = $namedRange->getRange();
@@ -1317,7 +1317,7 @@ 
                         return $namedRange->getWorksheet()->cellExists($pCoordinate);
                     }
 
-                    throw new Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle());
+                    throw new Exception('Named range '.$namedRange->getName().' is not accessible from within sheet '.$this->getTitle());
                 }
             } else {
                 return false;
@@ -1347,7 +1347,7 @@ 
      */
     public function cellExistsByColumnAndRow($columnIndex, $row)
     {
-        return $this->cellExists(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        return $this->cellExists(Coordinate::stringFromColumnIndex($columnIndex).$row);
     }
 
     /**
@@ -1527,12 +1527,12 @@ 
     public function getStyleByColumnAndRow($columnIndex1, $row1, $columnIndex2 = null, $row2 = null)
     {
         if ($columnIndex2 !== null && $row2 !== null) {
-            $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+            $cellRange = Coordinate::stringFromColumnIndex($columnIndex1).$row1.':'.Coordinate::stringFromColumnIndex($columnIndex2).$row2;
 
             return $this->getStyle($cellRange);
         }
 
-        return $this->getStyle(Coordinate::stringFromColumnIndex($columnIndex1) . $row1);
+        return $this->getStyle(Coordinate::stringFromColumnIndex($columnIndex1).$row1);
     }
 
     /**
@@ -1561,7 +1561,7 @@ 
         }
 
         // Calculate range outer borders
-        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange . ':' . $pRange);
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange.':'.$pRange);
 
         // Make sure we can loop upwards on rows and columns
         if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
@@ -1573,7 +1573,7 @@ 
         // Loop through cells and apply styles
         for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
             for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                $this->getCell(Coordinate::stringFromColumnIndex($col) . $row)->setXfIndex($xfIndex);
+                $this->getCell(Coordinate::stringFromColumnIndex($col).$row)->setXfIndex($xfIndex);
             }
         }
 
@@ -1601,7 +1601,7 @@ 
         }
 
         // Calculate range outer borders
-        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange . ':' . $pRange);
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange.':'.$pRange);
 
         // Make sure we can loop upwards on rows and columns
         if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
@@ -1613,7 +1613,7 @@ 
         // Loop through cells and apply styles
         for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
             for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                $this->setConditionalStyles(Coordinate::stringFromColumnIndex($col) . $row, $pCellStyle);
+                $this->setConditionalStyles(Coordinate::stringFromColumnIndex($col).$row, $pCellStyle);
             }
         }
 
@@ -1661,7 +1661,7 @@ 
      */
     public function setBreakByColumnAndRow($columnIndex, $row, $break)
     {
-        return $this->setBreak(Coordinate::stringFromColumnIndex($columnIndex) . $row, $break);
+        return $this->setBreak(Coordinate::stringFromColumnIndex($columnIndex).$row, $break);
     }
 
     /**
@@ -1730,7 +1730,7 @@ 
      */
     public function mergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1).$row1.':'.Coordinate::stringFromColumnIndex($columnIndex2).$row2;
 
         return $this->mergeCells($cellRange);
     }
@@ -1753,7 +1753,7 @@ 
             if (isset($this->mergeCells[$pRange])) {
                 unset($this->mergeCells[$pRange]);
             } else {
-                throw new Exception('Cell range ' . $pRange . ' not known as merged.');
+                throw new Exception('Cell range '.$pRange.' not known as merged.');
             }
         } else {
             throw new Exception('Merge can only be removed from a range of cells.');
@@ -1776,7 +1776,7 @@ 
      */
     public function unmergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1).$row1.':'.Coordinate::stringFromColumnIndex($columnIndex2).$row2;
 
         return $this->unmergeCells($cellRange);
     }
@@ -1842,7 +1842,7 @@ 
      */
     public function protectCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2, $password, $alreadyHashed = false)
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1).$row1.':'.Coordinate::stringFromColumnIndex($columnIndex2).$row2;
 
         return $this->protectCells($cellRange, $password, $alreadyHashed);
     }
@@ -1864,7 +1864,7 @@ 
         if (isset($this->protectedCells[$pRange])) {
             unset($this->protectedCells[$pRange]);
         } else {
-            throw new Exception('Cell range ' . $pRange . ' not known as protected.');
+            throw new Exception('Cell range '.$pRange.' not known as protected.');
         }
 
         return $this;
@@ -1884,7 +1884,7 @@ 
      */
     public function unprotectCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1).$row1.':'.Coordinate::stringFromColumnIndex($columnIndex2).$row2;
 
         return $this->unprotectCells($cellRange);
     }
@@ -1945,9 +1945,9 @@ 
     public function setAutoFilterByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
     {
         return $this->setAutoFilter(
-            Coordinate::stringFromColumnIndex($columnIndex1) . $row1
-            . ':' .
-            Coordinate::stringFromColumnIndex($columnIndex2) . $row2
+            Coordinate::stringFromColumnIndex($columnIndex1).$row1
+            . ':'.
+            Coordinate::stringFromColumnIndex($columnIndex2).$row2
         );
     }
 
@@ -1997,7 +1997,7 @@ 
 
         if ($cell !== null && $topLeftCell === null) {
             $coordinate = Coordinate::coordinateFromString($cell);
-            $topLeftCell = $coordinate[0] . $coordinate[1];
+            $topLeftCell = $coordinate[0].$coordinate[1];
         }
 
         $this->freezePane = $cell;
@@ -2016,7 +2016,7 @@ 
      */
     public function freezePaneByColumnAndRow($columnIndex, $row)
     {
-        return $this->freezePane(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        return $this->freezePane(Coordinate::stringFromColumnIndex($columnIndex).$row);
     }
 
     /**
@@ -2053,7 +2053,7 @@ 
     {
         if ($pBefore >= 1) {
             $objReferenceHelper = ReferenceHelper::getInstance();
-            $objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this);
+            $objReferenceHelper->insertNewBefore('A'.$pBefore, 0, $pNumRows, $this);
         } else {
             throw new Exception('Rows can only be inserted before at least row 1.');
         }
@@ -2075,7 +2075,7 @@ 
     {
         if (!is_numeric($pBefore)) {
             $objReferenceHelper = ReferenceHelper::getInstance();
-            $objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this);
+            $objReferenceHelper->insertNewBefore($pBefore.'1', $pNumCols, 0, $this);
         } else {
             throw new Exception('Column references should not be numeric.');
         }
@@ -2129,7 +2129,7 @@ 
         }
 
         $objReferenceHelper = ReferenceHelper::getInstance();
-        $objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this);
+        $objReferenceHelper->insertNewBefore('A'.($pRow + $pNumRows), 0, -$pNumRows, $this);
         for ($r = 0; $r < $removedRowsCounter; ++$r) {
             $this->getCellCollection()->removeRow($highestRow);
             --$highestRow;
@@ -2164,7 +2164,7 @@ 
 
         $pColumn = Coordinate::stringFromColumnIndex($pColumnIndex + $pNumCols);
         $objReferenceHelper = ReferenceHelper::getInstance();
-        $objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
+        $objReferenceHelper->insertNewBefore($pColumn.'1', -$pNumCols, 0, $this);
 
         $maxPossibleColumnsToBeRemoved = $highestColumnIndex - $pColumnIndex + 1;
 
@@ -2385,7 +2385,7 @@ 
      */
     public function getCommentByColumnAndRow($columnIndex, $row)
     {
-        return $this->getComment(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        return $this->getComment(Coordinate::stringFromColumnIndex($columnIndex).$row);
     }
 
     /**
@@ -2467,7 +2467,7 @@ 
      */
     public function setSelectedCellByColumnAndRow($columnIndex, $row)
     {
-        return $this->setSelectedCells(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        return $this->setSelectedCells(Coordinate::stringFromColumnIndex($columnIndex).$row);
     }
 
     /**
@@ -2523,12 +2523,12 @@ 
                 if ($strictNullComparison) {
                     if ($cellValue !== $nullValue) {
                         // Set cell value
-                        $this->getCell($currentColumn . $startRow)->setValue($cellValue);
+                        $this->getCell($currentColumn.$startRow)->setValue($cellValue);
                     }
                 } else {
                     if ($cellValue != $nullValue) {
                         // Set cell value
-                        $this->getCell($currentColumn . $startRow)->setValue($cellValue);
+                        $this->getCell($currentColumn.$startRow)->setValue($cellValue);
                     }
                 }
                 ++$currentColumn;
@@ -2573,9 +2573,9 @@ 
                 $cRef = $returnCellRef ? $col : ++$c;
                 //    Using getCell() will create a new cell if it doesn't already exist. We don't want that to happen
                 //        so we test and retrieve directly against cellCollection
-                if ($this->cellCollection->has($col . $row)) {
+                if ($this->cellCollection->has($col.$row)) {
                     // Cell exists
-                    $cell = $this->cellCollection->get($col . $row);
+                    $cell = $this->cellCollection->get($col.$row);
                     if ($cell->getValue() !== null) {
                         if ($cell->getValue() instanceof RichText) {
                             $returnValue[$rRef][$cRef] = $cell->getValue()->getPlainText();
@@ -2633,7 +2633,7 @@ 
             return $pWorkSheet->rangeToArray($pCellRange, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
         }
 
-        throw new Exception('Named Range ' . $pNamedRange . ' does not exist.');
+        throw new Exception('Named Range '.$pNamedRange.' does not exist.');
     }
 
     /**
@@ -2657,7 +2657,7 @@ 
         $maxRow = $this->getHighestRow();
 
         // Return
-        return $this->rangeToArray('A1:' . $maxCol . $maxRow, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
+        return $this->rangeToArray('A1:'.$maxCol.$maxRow, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
     }
 
     /**
@@ -2731,7 +2731,7 @@ 
     public function getHashCode()
     {
         if ($this->dirty) {
-            $this->hash = md5($this->title . $this->autoFilter . ($this->protection->isProtectionEnabled() ? 't' : 'f') . __CLASS__);
+            $this->hash = md5($this->title.$this->autoFilter.($this->protection->isProtectionEnabled() ? 't' : 'f').__CLASS__);
             $this->dirty = false;
         }
 
@@ -2914,7 +2914,7 @@ 
             if ($rangeBoundaries[1][1] > $maxRow) {
                 $rangeBoundaries[1][1] = $maxRow;
             }
-            $rangeSet = $rangeBoundaries[0][0] . $rangeBoundaries[0][1] . ':' . $rangeBoundaries[1][0] . $rangeBoundaries[1][1];
+            $rangeSet = $rangeBoundaries[0][0].$rangeBoundaries[0][1].':'.$rangeBoundaries[1][0].$rangeBoundaries[1][1];
         }
         unset($rangeSet);
 
@@ -3039,7 +3039,7 @@ 
                         $pValue = Shared\StringHelper::substring($pValue, 0, 29);
                     }
                     $i = 1;
-                    while ($this->getParent()->sheetCodeNameExists($pValue . '_' . $i)) {
+                    while ($this->getParent()->sheetCodeNameExists($pValue.'_'.$i)) {
                         ++$i;
                         if ($i == 10) {
                             if (Shared\StringHelper::countCharacters($pValue) > 28) {
@@ -3052,7 +3052,7 @@ 
                         }
                     }
 
-                    $pValue .= '_' . $i; // ok, we have a valid name
+                    $pValue .= '_'.$i; // ok, we have a valid name
                 }
             }
         }

htdocs/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php

Spacing +11 added lines, -12 removed lines

@@ -124,8 +124,7 @@ 
         $this->rotation = 0;
         $this->shadow = new Drawing\Shadow();
 
-        // Set image index
-        ++self::$imageCounter;
+        // Set image index++self::$imageCounter;
         $this->imageIndex = self::$imageCounter;
     }
 
@@ -488,16 +487,16 @@ 
     public function getHashCode()
     {
         return md5(
-            $this->name .
-            $this->description .
-            $this->worksheet->getHashCode() .
-            $this->coordinates .
-            $this->offsetX .
-            $this->offsetY .
-            $this->width .
-            $this->height .
-            $this->rotation .
-            $this->shadow->getHashCode() .
+            $this->name.
+            $this->description.
+            $this->worksheet->getHashCode().
+            $this->coordinates.
+            $this->offsetX.
+            $this->offsetY.
+            $this->width.
+            $this->height.
+            $this->rotation.
+            $this->shadow->getHashCode().
             __CLASS__
         );
     }