upd mergeCells()

aVadim483 · Nov 4, 2023 · 259748d · 259748d
1 parent dded275
commit 259748d
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -81,11 +81,6 @@ Use `composer` to install **FastExcelWriter** into your project:
 composer require avadim/fast-excel-writer
 ```
 
-Also, you can download package and include autoload file of the library:
-```php
-require 'path/to/fast-excel-writer/src/autoload.php';
-```
-
 ## Changes In Version 4
 
 * Now the library works even faster

diff --git a/src/FastExcelWriter/Sheet.php b/src/FastExcelWriter/Sheet.php
@@ -1854,10 +1854,11 @@ public function writeArrayTo($topLeftCell, array $data): Sheet
      * mergeCells(['A1:B2', 'C1:D2'])
      *
      * @param array|string|int $rangeSet
+     * @param int|null $actionMode 0 - exception, 1 - replace, 2 - keep
      *
      * @return $this
      */
-    public function mergeCells($rangeSet): Sheet
+    public function mergeCells($rangeSet, ?int $actionMode = 0): Sheet
     {
         foreach((array)$rangeSet as $range) {
             if (isset($this->mergeCells[$range]) || empty($range)) {
@@ -1873,10 +1874,21 @@ public function mergeCells($rangeSet): Sheet
                     && ((($dimension['colNum1'] >= $savedDimension['colNum1']) && ($dimension['colNum1'] <= $savedDimension['colNum2']))
                         || (($dimension['colNum2'] >= $savedDimension['colNum1']) && ($dimension['colNum2'] <= $savedDimension['colNum2'])))
                 ) {
-                    throw new Exception("Cannot merge cells $range because they are intersecting with $savedRange");
+                    if ($actionMode === 1) {
+                        unset($this->mergeCells[$savedRange]);
+                    }
+                    elseif ($actionMode === 2) {
+                        $dimension = [];
+                        break;
+                    }
+                    else {
+                        throw new Exception("Cannot merge cells $range because they are intersecting with $savedRange");
+                    }
                 }
             }
-            $this->mergeCells[$dimension['range']] = $dimension;
+            if ($dimension) {
+                $this->mergeCells[$dimension['range']] = $dimension;
+            }
         }
 
         return $this;

diff --git a/tests/FastExcelWriterTest.php b/tests/FastExcelWriterTest.php
@@ -552,6 +552,39 @@ public function testExcelWriter5()
         unlink($testFileName);
     }
 
+    public function testExcelWriterMergedCells()
+    {
+        $testFileName = __DIR__ . '/test_merged.xlsx';
+        if (file_exists($testFileName)) {
+            unlink($testFileName);
+        }
+
+        $excel = Excel::create();
+        $sheet = $excel->sheet();
+
+        $area = $sheet->beginArea();
+        $area->setValue('A1', 'A');
+        // Write value to automerged cells
+        $area->setValue('A2:D2', 'A2:D2');
+        $sheet->writeAreas();
+
+        $sheet->writeCell(11);
+        $sheet->writeCell(12);
+        $sheet->writeCell(13);
+        $sheet->nextRow();
+        $sheet->writeCell(21);
+        $sheet->writeCell(32);
+        $sheet->writeCell(43);
+        $sheet->mergeCells('A4:C4');
+
+        $this->excelReader = $this->saveCheckRead($excel, $testFileName);
+        $mergedCells = $this->excelReader->sheet()->getMergedCells();
+        $a = ['A2' => 'A2:D2', 'A4' => 'A4:C4'];
+        $this->assertEquals($a, $mergedCells);
+
+        unlink($testFileName);
+    }
+
     public function testExcelWriterNotesAndImages()
     {
         $testFileName = __DIR__ . '/test_notes_images.xlsx';