Added support for mergeCells, cell height, shrink to fit

src/Spout/Common/Entity/Row.php

@@ -18,6 +18,12 @@ class Row
      */
     protected $style;
 
+    /**
+     * Row height (default is 15)
+     * @var string
+     */
+    protected $height = '15';
+
     /**
      * Row constructor.
      * @param Cell[] $cells
@@ -126,4 +132,25 @@ 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/Spout/Common/Entity/Style/Style.php

@@ -66,6 +66,11 @@ class Style
     /** @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;
 
@@ -463,4 +468,33 @@ 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;
+
+        return $this;
+    }
+
+    /**
+     * @return bool Whether format should be applied
+     */
+    public function shouldShrinkToFit()
+    {
+        return $this->shouldShrinkToFit;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasSetShrinkToFit()
+    {
+        return $this->hasSetShrinkToFit;
+    }
 }

src/Spout/Common/Manager/OptionsManagerAbstract.php

@@ -51,6 +51,23 @@ public function setOption($optionName, $optionValue)
         }
     }
 
+    /**
+     * Add an option to the internal list of options
+     * Used only for mergeCells() for now
+     * @param mixed $optionName
+     * @param mixed $optionValue
+     * @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
      * @return mixed|null The set option or NULL if no option with given name found

src/Spout/Common/Manager/OptionsManagerInterface.php

@@ -19,4 +19,13 @@ public function setOption($optionName, $optionValue);
      * @return mixed|null The set option or NULL if no option with given name found
      */
     public function getOption($optionName);
+
+    /**
+     * Add an option to the internal list of options
+     * Used only for mergeCells() for now
+     * @param mixed $optionName
+     * @param mixed $optionValue
+     * @return void
+     */
+    public function addOption($optionName, $optionValue);
 }

src/Spout/Reader/ODS/SheetIterator.php

@@ -28,13 +28,13 @@ class SheetIterator implements IteratorInterface
     const XML_ATTRIBUTE_TABLE_STYLE_NAME = 'table:style-name';
     const XML_ATTRIBUTE_TABLE_DISPLAY = 'table:display';
 
-    /** @var string $filePath Path of the file to be read */
+    /** @var string Path of the file to be read */
     protected $filePath;
 
     /** @var \Box\Spout\Common\Manager\OptionsManagerInterface Reader's options manager */
     protected $optionsManager;
 
-    /** @var InternalEntityFactory $entityFactory Factory to create entities */
+    /** @var InternalEntityFactory Factory to create entities */
     protected $entityFactory;
 
     /** @var XMLReader The XMLReader object that will help read sheet's XML data */

src/Spout/Reader/XLSX/Manager/SharedStringsManager.php

@@ -43,7 +43,7 @@ class SharedStringsManager
     /** @var InternalEntityFactory Factory to create entities */
     protected $entityFactory;
 
-    /** @var HelperFactory $helperFactory Factory to create helpers */
+    /** @var HelperFactory Factory to create helpers */
     protected $helperFactory;
 
     /** @var CachingStrategyFactory Factory to create shared strings caching strategies */

src/Spout/Reader/XLSX/RowIterator.php

@@ -35,7 +35,7 @@ class RowIterator implements IteratorInterface
     /** @var string Path of the XLSX file being read */
     protected $filePath;
 
-    /** @var string $sheetDataXMLFilePath Path of the sheet data XML file as in [Content_Types].xml */
+    /** @var string Path of the sheet data XML file as in [Content_Types].xml */
     protected $sheetDataXMLFilePath;
 
     /** @var \Box\Spout\Reader\Wrapper\XMLReader The XMLReader object that will help read sheet's XML data */

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

@@ -183,6 +183,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/Options.php

@@ -20,4 +20,10 @@ abstract class Options
 
     // XLSX specific options
     const SHOULD_USE_INLINE_STRINGS = 'shouldUseInlineStrings';
+
+    // XLSX column widths
+    const COLUMN_WIDTHS = 'columnWidths';
+
+    // XLSX merge cells
+    const MERGE_CELLS = 'mergeCells';
 }

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

@@ -27,6 +27,9 @@ class Sheet
     /** @var SheetManager Sheet manager */
     private $sheetManager;
 
+    /** @var bool Sheet is started */
+    private $isSheetStarted = false;
+
     /**
      * @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 +111,23 @@ 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;
+    }
 }

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

@@ -85,6 +85,9 @@ 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());
         }

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

@@ -44,7 +44,7 @@ abstract class WorkbookManagerAbstract implements WorkbookManagerInterface
     /** @var InternalEntityFactory Factory to create entities */
     protected $entityFactory;
 
-    /** @var ManagerFactoryInterface $managerFactory Factory to create managers */
+    /** @var ManagerFactoryInterface Factory to create managers */
     protected $managerFactory;
 
     /** @var Worksheet The worksheet where data will be written to */

src/Spout/Writer/ODS/Creator/ManagerFactory.php

@@ -22,7 +22,7 @@ class ManagerFactory implements ManagerFactoryInterface
     /** @var InternalEntityFactory */
     protected $entityFactory;
 
-    /** @var HelperFactory $helperFactory */
+    /** @var HelperFactory */
     protected $helperFactory;
 
     /**

src/Spout/Writer/WriterAbstract.php

@@ -33,7 +33,7 @@ abstract class WriterAbstract implements WriterInterface
     /** @var GlobalFunctionsHelper Helper to work with global functions */
     protected $globalFunctionsHelper;
 
-    /** @var HelperFactory $helperFactory */
+    /** @var HelperFactory */
     protected $helperFactory;
 
     /** @var OptionsManagerInterface Writer options manager */

src/Spout/Writer/WriterMultiSheetsAbstract.php

@@ -4,6 +4,7 @@
 
 use Box\Spout\Common\Creator\HelperFactory;
 use Box\Spout\Common\Entity\Row;
+use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\GlobalFunctionsHelper;
 use Box\Spout\Common\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Creator\ManagerFactoryInterface;
@@ -97,6 +98,7 @@ public function getSheets()
      * Creates a new sheet and make it the current sheet. The data will now be written to this sheet.
      *
      * @throws WriterNotOpenedException If the writer has not been opened yet
+     * @throws IOException If unable to open the sheet for writing
      * @return Sheet The created sheet
      */
     public function addNewSheetAndMakeItCurrent()

src/Spout/Writer/XLSX/Creator/ManagerFactory.php

@@ -24,7 +24,7 @@ class ManagerFactory implements ManagerFactoryInterface
     /** @var InternalEntityFactory */
     protected $entityFactory;
 
-    /** @var HelperFactory $helperFactory */
+    /** @var HelperFactory */
     protected $helperFactory;
 
     /**

src/Spout/Writer/XLSX/Manager/OptionsManager.php

@@ -39,6 +39,8 @@ protected function getSupportedOptions()
             Options::DEFAULT_ROW_STYLE,
             Options::SHOULD_CREATE_NEW_SHEETS_AUTOMATICALLY,
             Options::SHOULD_USE_INLINE_STRINGS,
+            Options::COLUMN_WIDTHS,
+            Options::MERGE_CELLS,
         ];
     }
 
@@ -56,5 +58,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/Spout/Writer/XLSX/Manager/Style/StyleManager.php

@@ -249,7 +249,7 @@ protected function getCellXfsSectionContent()
 
             $content .= \sprintf(' applyBorder="%d"', $style->shouldApplyBorder() ? 1 : 0);
 
-            if ($style->shouldApplyCellAlignment() || $style->shouldWrapText()) {
+            if ($style->shouldApplyCellAlignment() || $style->shouldWrapText() || $style->shouldShrinkToFit()) {
                 $content .= ' applyAlignment="1">';
                 $content .= '<alignment';
                 if ($style->shouldApplyCellAlignment()) {
@@ -258,6 +258,10 @@ protected function getCellXfsSectionContent()
                 if ($style->shouldWrapText()) {
                     $content .= ' wrapText="1"';
                 }
+                if ($style->shouldShrinkToFit()) {
+                    $content .= ' shrinkToFit="true"';
+                }
+
                 $content .= '/>';
                 $content .= '</xf>';
             } else {