Add support for clear old column widths

.travis.yml

@@ -58,4 +58,4 @@ after_script:
     if [[ "$WITH_COVERAGE" == "true" ]]; then
       wget https://scrutinizer-ci.com/ocular.phar
       php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover
-    fi
+    fi 

src/Spout/Common/Entity/Row.php

@@ -6,6 +6,8 @@
 
 class Row
 {
+    public const DEFAULT_HEIGHT = 15;
+
     /**
      * The cells in this row
      * @var Cell[]
@@ -18,6 +20,18 @@ class Row
      */
     protected $style;
 
+    /**
+     * Row height
+     * @var float
+     */
+    protected $height = self::DEFAULT_HEIGHT;
+
+    /**
+     * Whether the height property was set
+     * @var bool
+     */
+    protected $hasSetHeight = false;
+
     /**
      * Row constructor.
      * @param Cell[] $cells
@@ -126,4 +140,34 @@ public function toArray()
             return $cell->getValue();
         }, $this->cells);
     }
+
+    /**
+     * Set row height
+     * @param float $height
+     * @return Row
+     */
+    public function setHeight($height)
+    {
+        $this->height = $height;
+        $this->hasSetHeight = (bool)$height;
+
+        return $this;
+    }
+
+    /**
+     * Returns row height
+     * @return float
+     */
+    public function getHeight()
+    {
+        return $this->height;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasSetHeight(): bool
+    {
+        return $this->hasSetHeight;
+    }
 }

src/Spout/Common/Entity/Style/CellVerticalAlignment.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Box\Spout\Common\Entity\Style;
+
+/**
+ * Class Vertical Alignment
+ * This class provides constants to work with text vertical alignment.
+ */
+abstract class CellVerticalAlignment
+{
+    const TOP = 'top';
+    const CENTER = 'center';
+    const BOTTOM = 'bottom';
+    const JUSTIFY = 'justify';
+    const DISTRIBUTED = 'distributed';
+
+    private static $VALID_VERTICAL_ALIGNMENTS = [
+        self::TOP => 1,
+        self::CENTER => 1,
+        self::BOTTOM => 1,
+        self::JUSTIFY => 1,
+        self::DISTRIBUTED => 1,
+    ];
+
+    /**
+     * @param string $cellVerticalAlignment
+     *
+     * @return bool Whether the given cell vertical alignment is valid
+     */
+    public static function isValid($cellVerticalAlignment)
+    {
+        return isset(self::$VALID_VERTICAL_ALIGNMENTS[$cellVerticalAlignment]);
+    }
+}

src/Spout/Common/Entity/Style/Style.php

@@ -61,11 +61,23 @@ class Style
     /** @var bool Whether the cell alignment property was set */
     private $hasSetCellAlignment = false;
 
+    /** @var bool Whether specific cell alignment should be applied */
+    private $shouldApplyCellVerticalAlignment = false;
+    /** @var string Cell alignment */
+    private $cellVerticalAlignment;
+    /** @var bool Whether the cell alignment property was set */
+    private $hasSetCellVerticalAlignment = false;
+
     /** @var bool Whether the text should wrap in the cell (useful for long or multi-lines text) */
     private $shouldWrapText = false;
     /** @var bool Whether the wrap text property was set */
     private $hasSetWrapText = false;
 
+    /** @var bool Whether the cell should shrink to fit to content */
+    private $shouldShrinkToFit = false;
+    /** @var bool Whether the shouldShrinkToFit text property was set */
+    private $hasSetShrinkToFit = false;
+
     /** @var Border */
     private $border;
 
@@ -385,6 +397,45 @@ public function shouldApplyCellAlignment()
         return $this->shouldApplyCellAlignment;
     }
 
+    /**
+     * @return string
+     */
+    public function getCellVerticalAlignment()
+    {
+        return $this->cellVerticalAlignment;
+    }
+
+    /**
+     * @param string $cellVerticalAlignment The cell vertical alignment
+     *
+     * @return Style
+     */
+    public function setCellVerticalAlignment($cellVerticalAlignment)
+    {
+        $this->cellVerticalAlignment = $cellVerticalAlignment;
+        $this->hasSetCellVerticalAlignment = true;
+        $this->shouldApplyCellVerticalAlignment = true;
+        $this->isEmpty = false;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasSetCellVerticalAlignment()
+    {
+        return $this->hasSetCellVerticalAlignment;
+    }
+
+    /**
+     * @return bool Whether specific cell vertical alignment should be applied
+     */
+    public function shouldApplyCellVerticalAlignment()
+    {
+        return $this->shouldApplyCellVerticalAlignment;
+    }
+
     /**
      * @return bool
      */
@@ -482,6 +533,36 @@ public function shouldApplyFormat()
         return $this->hasSetFormat;
     }
 
+    /**
+     * Sets should shrink to fit
+     * @param bool $shrinkToFit
+     * @return Style
+     */
+    public function setShouldShrinkToFit($shrinkToFit = true)
+    {
+        $this->hasSetShrinkToFit = true;
+        $this->shouldShrinkToFit = $shrinkToFit;
+        $this->isEmpty = false;
+
+        return $this;
+    }
+
+    /**
+     * @return bool Whether format should be applied
+     */
+    public function shouldShrinkToFit()
+    {
+        return $this->shouldShrinkToFit;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasSetShrinkToFit()
+    {
+        return $this->hasSetShrinkToFit;
+    }
+
     /**
      * @return bool
      */

src/Spout/Writer/Common/Creator/Style/StyleBuilder.php

@@ -4,6 +4,7 @@
 
 use Box\Spout\Common\Entity\Style\Border;
 use Box\Spout\Common\Entity\Style\CellAlignment;
+use Box\Spout\Common\Entity\Style\CellVerticalAlignment;
 use Box\Spout\Common\Entity\Style\Style;
 use Box\Spout\Common\Exception\InvalidArgumentException;
 
@@ -143,6 +144,25 @@ public function setCellAlignment($cellAlignment)
         return $this;
     }
 
+    /**
+     * Sets the cell vertical alignment.
+     *
+     * @param string $cellVerticalAlignment The cell vertical alignment
+     *
+     * @throws InvalidArgumentException If the given cell vertical alignment is not valid
+     * @return StyleBuilder
+     */
+    public function setCellVerticalAlignment($cellVerticalAlignment)
+    {
+        if (!CellVerticalAlignment::isValid($cellVerticalAlignment)) {
+            throw new InvalidArgumentException('Invalid cell vertical alignment value');
+        }
+
+        $this->style->setCellVerticalAlignment($cellVerticalAlignment);
+
+        return $this;
+    }
+
     /**
      * Set a border
      *
@@ -183,6 +203,19 @@ public function setFormat($format)
         return $this;
     }
 
+    /**
+     * Set should shrink to fit
+     * @param bool $shrinkToFit
+     * @return StyleBuilder
+     * @api
+     */
+    public function setShouldShrinkToFit($shrinkToFit = true)
+    {
+        $this->style->setShouldShrinkToFit($shrinkToFit);
+
+        return $this;
+    }
+
     /**
      * Returns the configured style. The style is cached and can be reused.
      *

src/Spout/Writer/Common/Entity/Sheet.php

@@ -2,6 +2,7 @@
 
 namespace Box\Spout\Writer\Common\Entity;
 
+use Box\Spout\Writer\Common\Helper\CellHelper;
 use Box\Spout\Writer\Common\Manager\SheetManager;
 
 /**
@@ -27,6 +28,9 @@ class Sheet
     /** @var SheetManager Sheet manager */
     private $sheetManager;
 
+    /** @var array merge cell */
+    private array $mergeRanges = [];
+
     /**
      * @param int $sheetIndex Index of the sheet, based on order in the workbook (zero-based)
      * @param string $associatedWorkbookId ID of the sheet's associated workbook
@@ -108,4 +112,48 @@ public function setIsVisible($isVisible)
 
         return $this;
     }
+
+    /**
+     * @return array
+     */
+    public function getMergeRanges()
+    {
+        return $this->mergeRanges;
+    }
+
+    /**
+     * @param array $mergeRanges
+     * @return array
+     */
+    public function setMergeRanges(array $mergeRanges)
+    {
+        return $this->mergeRanges = $mergeRanges;
+    }
+
+    /**
+     * @param $mergeRanges
+     * @return array
+     */
+    public function addMergeRanges(string ...$mergeRanges)
+    {
+        return $this->mergeRanges = array_merge($this->mergeRanges, $mergeRanges);
+    }
+
+    /**
+     * @param int $fromColumnIndexZeroBased
+     * @param int $fromRowIndexOneBased
+     * @param int $toColumnIndexZeroBased
+     * @param int $toRowIndexOneBased
+     * @return array
+     */
+    public function addMergeRangeByIndexes(
+        int $fromColumnIndexZeroBased,
+        int $fromRowIndexOneBased,
+        int $toColumnIndexZeroBased,
+        int $toRowIndexOneBased
+    ) {
+        $fromLetter = CellHelper::getColumnLettersFromColumnIndex($fromColumnIndexZeroBased);
+        $toLetter = CellHelper::getColumnLettersFromColumnIndex($toColumnIndexZeroBased);
+        return $this->addMergeRanges("{$fromLetter}{$fromRowIndexOneBased}:{$toLetter}{$toRowIndexOneBased}");
+    }
 }

src/Spout/Writer/Common/Manager/ManagesCellSize.php

@@ -29,6 +29,14 @@ public function setDefaultRowHeight($height)
         $this->defaultRowHeight = $height;
     }
 
+    /**
+     * Clear old column widths when we want to start new sheet
+     */
+    public function clearColumnWidths()
+    {
+        $this->columnWidths = [];
+    }
+
     /**
      * @param float $width
      * @param array $columns One or more columns with this width

src/Spout/Writer/Common/Manager/Style/StyleMerger.php

@@ -85,9 +85,15 @@ private function mergeCellProperties(Style $styleToUpdate, Style $style, Style $
         if (!$style->hasSetWrapText() && $baseStyle->shouldWrapText()) {
             $styleToUpdate->setShouldWrapText();
         }
+        if (!$style->hasSetShrinkToFit() && $baseStyle->shouldShrinkToFit()) {
+            $styleToUpdate->setShouldShrinkToFit();
+        }
         if (!$style->hasSetCellAlignment() && $baseStyle->shouldApplyCellAlignment()) {
             $styleToUpdate->setCellAlignment($baseStyle->getCellAlignment());
         }
+        if (!$style->hasSetCellVerticalAlignment() && $baseStyle->shouldApplyCellVerticalAlignment()) {
+            $styleToUpdate->setCellVerticalAlignment($baseStyle->getCellVerticalAlignment());
+        }
         if (!$style->getBorder() && $baseStyle->shouldApplyBorder()) {
             $styleToUpdate->setBorder($baseStyle->getBorder());
         }

src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php

@@ -303,6 +303,14 @@ public function setDefaultRowHeight(float $height)
         $this->worksheetManager->setDefaultRowHeight($height);
     }
 
+    /**
+     * Clear old column widths when we want to start new sheet
+     */
+    public function clearColumnWidths()
+    {
+        $this->worksheetManager->clearColumnWidths();
+    }
+
     /**
      * @param float $width
      * @param array $columns One or more columns with this width

src/Spout/Writer/Common/Manager/WorksheetManagerInterface.php

@@ -21,6 +21,11 @@ public function setDefaultColumnWidth($width);
      */
     public function setDefaultRowHeight($height);
 
+    /**
+     * Clear old column widths when we want to start new sheet
+     */
+    public function clearColumnWidths();
+
     /**
      * @param float $width
      * @param array $columns One or more columns with this width