Merge pull request #4468 from oleibman/issue1425

Copy Styles after insertNewColumnBefore

Author: oleibman

CHANGELOG.md

@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Micro-optimization for excelToDateTimeObject. [Issue #4438](https://github.com/PHPOffice/PhpSpreadsheet/issues/4438) [PR #4442](https://github.com/PHPOffice/PhpSpreadsheet/pull/4442)
 - Removing Columns/Rows Containing Merged Cells. [Issue #282](https://github.com/PHPOffice/PhpSpreadsheet/issues/282) [PR #4465](https://github.com/PHPOffice/PhpSpreadsheet/pull/4465)
 - Print Area and Row Break. [Issue #1275](https://github.com/PHPOffice/PhpSpreadsheet/issues/1275) [PR #4450](https://github.com/PHPOffice/PhpSpreadsheet/pull/4450)
+- Copy Styles after insertNewColumnBefore. [Issue #1425](https://github.com/PHPOffice/PhpSpreadsheet/issues/1425) [PR #4468](https://github.com/PHPOffice/PhpSpreadsheet/pull/4468)
 - Xls Writer Treat Hyperlink Starting with # as Internal. [Issue #56](https://github.com/PHPOffice/PhpSpreadsheet/issues/56) [PR #4453](https://github.com/PHPOffice/PhpSpreadsheet/pull/4453)
 - ODS Handling of Ceiling and Floor. [Issue #407](https://github.com/PHPOffice/PhpSpreadsheet/issues/407) [PR #4466](https://github.com/PHPOffice/PhpSpreadsheet/pull/4466)
 

src/PhpSpreadsheet/ReferenceHelper.php

@@ -506,7 +506,7 @@ public function insertNewBefore(
         $highestColumn = $worksheet->getHighestColumn();
         $highestRow = $worksheet->getHighestRow();
 
-        if ($numberOfColumns > 0 && $beforeColumn - 2 > 0) {
+        if ($numberOfColumns > 0 && $beforeColumn > 1) {
             $this->duplicateStylesByColumn($worksheet, $beforeColumn, $beforeRow, $highestRow, $numberOfColumns);
         }
 
@@ -1242,7 +1242,7 @@ private function adjustTableDelete(int $startCol, int $numberOfColumns, int $ran
     private function duplicateStylesByColumn(Worksheet $worksheet, int $beforeColumn, int $beforeRow, int $highestRow, int $numberOfColumns): void
     {
         $beforeColumnName = Coordinate::stringFromColumnIndex($beforeColumn - 1);
-        for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
+        for ($i = $beforeRow; $i <= $highestRow; ++$i) {
             // Style
             $coordinate = $beforeColumnName . $i;
             if ($worksheet->cellExists($coordinate)) {

tests/PhpSpreadsheetTests/Worksheet/Issue1425Test.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PHPUnit\Framework\TestCase;
+
+class Issue1425Test extends TestCase
+{
+    private static function setBackground(Worksheet $sheet, string $cells, string $color = 'ffffff00'): void
+    {
+        $sheet->getStyle($cells)
+            ->getFill()
+            ->setFillType(Fill::FILL_SOLID);
+        $sheet->getStyle($cells)
+            ->getFill()
+            ->getStartColor()
+            ->setArgb($color);
+    }
+
+    /**
+     * Not extending styles to all cells after insertNewColumnBefore.
+     */
+    public function testIssue4125(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setTitle('Before');
+        $sheet->getCell('A1')->setValue(1);
+        $sheet->getCell('A2')->setValue(2);
+        $sheet->getCell('B1')->setValue(3);
+        $sheet->getCell('B2')->setValue(4);
+        self::setBackground($sheet, 'A1:A2');
+        self::setBackground($sheet, 'B1:B2', 'FF00FFFF');
+
+        $sheet->insertNewColumnBefore('B', 1);
+
+        $expected = [
+            'A1' => 'ffffff00',
+            'A2' => 'ffffff00',
+            'B1' => 'ffffff00',
+            'B2' => 'ffffff00',
+            'C1' => 'FF00FFFF',
+            'C2' => 'FF00FFFF',
+        ];
+        foreach ($expected as $key => $value) {
+            $color = $sheet->getStyle($key)
+                ->getFill()->getStartColor()->getArgb();
+            self::assertSame($value, $color, "error in cell $key");
+        }
+        $spreadsheet->disconnectWorksheets();
+    }
+}