improved performance of column width calculation for spreadsheets wit…

src/PhpSpreadsheet/Cell/Cell.php

@@ -496,16 +496,27 @@ public function isInMergeRange()
  public function isMergeRangeValueCell()
  {
  if ($mergeRange = $this->getMergeRange()) {
- $mergeRange = Coordinate::splitRange($mergeRange);
- [$startCell] = $mergeRange[0];
- if ($this->getCoordinate() === $startCell) {
- return true;
- }
+ return $this->isMergeRangeValueCell2($mergeRange);
  }
 
  return false;
  }
 
+ /**
+ * Is this cell the master (top left cell) in a merge range (that holds the actual data value).
+ *
+ * @param string $mergeRange merge range from getMergeRange()
+ *
+ * @return bool
+ */
+ public function isMergeRangeValueCell2($mergeRange)
+ {
+ $splittedRanges = Coordinate::splitRange($mergeRange);
+ [$startCell] = $splittedRanges[0];
+
+ return $this->getCoordinate() === $startCell;
+ }
+
  /**
  * If this cell is in a merge range, then return the range.
  *
@@ -555,13 +566,15 @@ public function isInRange($pRange)
  {
  [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange);
 
- // Translate properties
- $myColumn = Coordinate::columnIndexFromString($this->getColumn());
+ // Verify if cell is in range
  $myRow = $this->getRow();
+ if ($rangeStart[1] <= $myRow && $rangeEnd[1] >= $myRow) {
+ $myColumn = Coordinate::columnIndexFromString($this->getColumn());
 
- // Verify if cell is in range
- return ($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn) &&
- ($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow);
+ return ($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn);
+ }
+
+ return false;
  }
 
  /**

src/PhpSpreadsheet/Cell/Coordinate.php

@@ -13,6 +13,13 @@
  */
 abstract class Coordinate
 {
+ /**
+ * Cache for rangeBoundaries.
+ *
+ * @var array
+ */
+ private static $_rangeBoundariesCache = [];
+
  /**
  * Default range variable constant.
  *
@@ -167,6 +174,10 @@ public static function buildRange(array $pRange)
  */
  public static function rangeBoundaries($pRange)
  {
+ if (isset(self::$_rangeBoundariesCache[$pRange])) {
+ return self::$_rangeBoundariesCache[$pRange];
+ }
+
  // Ensure $pRange is a valid range
  if (empty($pRange)) {
  $pRange = self::DEFAULT_RANGE;
@@ -184,12 +195,14 @@ public static function rangeBoundaries($pRange)
 
  // Calculate range outer borders
  $rangeStart = self::coordinateFromString($rangeA);
- $rangeEnd = self::coordinateFromString($rangeB);
+ $rangeEnd = $rangeA === $rangeB ? $rangeStart : self::coordinateFromString($rangeB);
 
  // Translate column into index
  $rangeStart[0] = self::columnIndexFromString($rangeStart[0]);
  $rangeEnd[0] = self::columnIndexFromString($rangeEnd[0]);
 
+ self::$_rangeBoundariesCache[$pRange] = [$rangeStart, $rangeEnd];
+
  return [$rangeStart, $rangeEnd];
  }
 

src/PhpSpreadsheet/Worksheet/Worksheet.php

@@ -737,11 +737,13 @@ public function calculateColumnWidths()
  $isMergedButProceed = false;
 
  //The only exception is if it's a merge range value cell of a 'vertical' randge (1 column wide)
- if ($isMerged && $cell->isMergeRangeValueCell()) {
+ if ($isMerged) {
  $range = $cell->getMergeRange();
- $rangeBoundaries = Coordinate::rangeDimension($range);
- if ($rangeBoundaries[0] == 1) {
- $isMergedButProceed = true;
+ if ($cell->isMergeRangeValueCell2($range)) {
+ $rangeBoundaries = Coordinate::rangeDimension($range);
+ if ($rangeBoundaries[0] == 1) {
+ $isMergedButProceed = true;
+ }
  }
  }