Added support for mergeCells, cell height, shrink to fit

Added support for
    mergeCells:
        // mergeCells (B2:G2), you may use CellHelper::getColumnLettersFromColumnIndex() to convert from "B2" to "[1,2]"
	    $writer->mergeCells([1,2], [6, 2]);

    cell height:
        $row->setHeight(30);

    shouldShrinkToFit:
        $style->setShouldShrinkToFit();

These changes are implemented for XLSX as that's what I need and test spout on.

Author: quamis

src/Common/Entity/Row.php

@@ -20,6 +20,12 @@ class Row
      */
     protected $style;
 
+    /**
+     * Row height (default is 15)
+     * @var string
+     */
+    protected $height = "15";
+
     /**
      * Row constructor.
      *
@@ -132,4 +138,24 @@ public function toArray()
             return $cell->getValue();
         }, $this->cells);
     }
+
+    /**
+     * Set row height
+     * @param String $height
+     * @return Row
+     */
+    public function setHeight($height)
+    {
+        $this->height = $height;
+        return $this;
+    }
+
+    /**
+     * Returns row height
+     * @return String
+     */
+    public function getHeight()
+    {
+        return $this->height;
+    }
 }

src/Common/Entity/Style/Style.php

@@ -65,6 +65,9 @@ class Style
     /** @var bool Whether the wrap text property was set */
     private $hasSetWrapText = false;
 
+    private $shrinkToFit = false;
+    private $shouldShrinkToFit = false;
+
     /** @var null|Border */
     private $border;
 
@@ -510,4 +513,24 @@ public function isEmpty(): bool
     {
         return $this->isEmpty;
     }
+
+    /**
+     * Sets should shrink to fit
+     * @param bool $shrinkToFit
+     * @return Style
+     */
+    public function setShouldShrinkToFit($shrinkToFit = true)
+    {
+        $this->shrinkToFit = $shrinkToFit;
+        $this->shouldShrinkToFit = $shrinkToFit;
+        return $this;
+    }
+
+     /**
+     * @return bool Whether format should be applied
+     */
+    public function shouldShrinkToFit()
+    {
+        return $this->shouldShrinkToFit;
+    }
 }

src/Common/Manager/OptionsManagerAbstract.php

@@ -34,6 +34,21 @@ public function setOption($optionName, $optionValue)
         }
     }
 
+    /**
+     * Add an option to the internal list of options
+     * Used only for mergeCells() for now
+     * @return void
+     */
+    public function addOption($optionName, $optionValue)
+    {
+        if (\in_array($optionName, $this->supportedOptions)) {
+            if (!isset($this->options[$optionName])) {
+                $this->options[$optionName] = [];
+            }
+            $this->options[$optionName][] = $optionValue;
+        }
+    }
+
     /**
      * @param string $optionName
      *

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

@@ -186,6 +186,17 @@ public function setFormat($format)
         return $this;
     }
 
+    /**
+     * Set should shrink to fit
+     * @param boolean $shrinkToFit
+     * @return void
+     */
+    public function setShouldShrinkToFit($shrinkToFit = true)
+    {
+        $this->style->setShouldShrinkToFit($shrinkToFit);
+        return $this;
+    }
+
     /**
      * Returns the configured style. The style is cached and can be reused.
      *

src/Writer/Common/Entity/Options.php

@@ -24,4 +24,7 @@ abstract class Options
     public const DEFAULT_COLUMN_WIDTH = 'defaultColumnWidth';
     public const DEFAULT_ROW_HEIGHT = 'defaultRowHeight';
     public const COLUMN_WIDTHS = 'columnWidthDefinition';
+
+    // XLSX merge cells
+    const MERGE_CELLS = 'mergeCells';
 }

src/Writer/Common/Entity/Sheet.php

@@ -115,6 +115,25 @@ public function setIsVisible($isVisible)
         return $this;
     }
 
+    /**
+     * @return bool isSheetStarted Sheet was started
+     */
+    public function isSheetStarted()
+    {
+        return $this->isSheetStarted;
+    }
+
+    /**
+     * @param bool $isSheetStarted Set if sheet was started
+     * @return Sheet
+     */
+    public function setIsSheetStarted($isSheetStarted)
+    {
+        $this->isSheetStarted = $isSheetStarted;
+
+        return $this;
+    }
+
     public function getSheetView(): ?SheetView
     {
         return $this->sheetView;

src/Writer/WriterMultiSheetsAbstract.php

@@ -55,6 +55,29 @@ public function setShouldCreateNewSheetsAutomatically($shouldCreateNewSheetsAuto
         return $this;
     }
 
+    /**
+     * Set columns widths as list. If value is null will set column with default width (8.43)
+     * @param array $columnWidths
+     * @return WriterMultiSheetsAbstract
+     */
+    public function setColumnWidths(array $columnWidths)
+    {
+        $this->optionsManager->setOption(Options::COLUMN_WIDTHS, $columnWidths);
+        return $this;
+    }
+
+    /**
+     * Undocumented function
+     *
+     * @param array $range
+     * @return void
+     */
+    public function mergeCells(array $range1, array $range2)
+    {
+        $this->optionsManager->addOption(Options::MERGE_CELLS, [$range1, $range2]);
+        return $this;
+    }
+
     /**
      * Returns all the workbook's sheets.
      *

src/Writer/XLSX/Manager/OptionsManager.php

@@ -40,6 +40,7 @@ protected function getSupportedOptions()
             Options::DEFAULT_COLUMN_WIDTH,
             Options::DEFAULT_ROW_HEIGHT,
             Options::COLUMN_WIDTHS,
+            Options::MERGE_CELLS,
         ];
     }
 
@@ -58,5 +59,7 @@ protected function setDefaultOptions()
         $this->setOption(Options::DEFAULT_ROW_STYLE, $defaultRowStyle);
         $this->setOption(Options::SHOULD_CREATE_NEW_SHEETS_AUTOMATICALLY, true);
         $this->setOption(Options::SHOULD_USE_INLINE_STRINGS, true);
+        $this->setOption(Options::COLUMN_WIDTHS, []);
+        $this->setOption(Options::MERGE_CELLS, []);
     }
 }

src/Writer/XLSX/Manager/Style/StyleManager.php

@@ -259,6 +259,10 @@ protected function getCellXfsSectionContent()
                 if ($style->shouldWrapText()) {
                     $content .= ' wrapText="1"';
                 }
+                if ($style->shouldShrinkToFit()) {
+                    $content .= ' shrinkToFit="true"';
+                }
+
                 $content .= '/>';
                 $content .= '</xf>';
             } else {

src/Writer/XLSX/Manager/WorksheetManager.php

@@ -42,6 +42,9 @@ class WorksheetManager implements WorksheetManagerInterface
         <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
         EOD;
 
+    /** @var OptionsManagerInterface */
+    private $optionsManager;
+
     /** @var bool Whether inline or shared strings should be used */
     protected $shouldUseInlineStrings;
 
@@ -75,6 +78,7 @@ public function __construct(
         XLSXEscaper $stringsEscaper,
         StringHelper $stringHelper
     ) {
+        $this->optionsManager = $optionsManager;
         $this->shouldUseInlineStrings = $optionsManager->getOption(Options::SHOULD_USE_INLINE_STRINGS);
         $this->setDefaultColumnWidth($optionsManager->getOption(Options::DEFAULT_COLUMN_WIDTH));
         $this->setDefaultRowHeight($optionsManager->getOption(Options::DEFAULT_ROW_HEIGHT));
@@ -169,6 +173,20 @@ public function close(Worksheet $worksheet)
         }
         $this->ensureSheetDataStated($worksheet);
         fwrite($worksheetFilePointer, '</sheetData>');
+
+        // create nodes for merge cells
+        if ($this->optionsManager->getOption(Options::MERGE_CELLS)) {
+            $mergeCellString = '<mergeCells count="'.count($this->optionsManager->getOption(Options::MERGE_CELLS)).'">';
+            foreach ($this->optionsManager->getOption(Options::MERGE_CELLS) as $values) {
+                $output = array_map(function($value){
+                    return CellHelper::getColumnLettersFromColumnIndex($value[0]) . $value[1];
+                }, $values);
+                $mergeCellString.= '<mergeCell ref="'.implode(':', $output).'"/>';
+            }
+            $mergeCellString.= '</mergeCells>';
+            \fwrite($worksheet->getFilePointer(), $mergeCellString);
+        }
+
         fwrite($worksheetFilePointer, '</worksheet>');
         fclose($worksheetFilePointer);
     }