Merge pull request #4393 from oleibman/formularange

Add FormulaRange to IgnoredErrors Possibilities

Author: oleibman

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Added
 
-- Nothing yet.
+- Add FormulaRange to IgnoredErrors. [PR #4393](https://github.com/PHPOffice/PhpSpreadsheet/pull/4393)
 
 ### Removed
 

src/PhpSpreadsheet/Cell/IgnoredErrors.php

@@ -8,6 +8,8 @@ class IgnoredErrors
 
     private bool $formula = false;
 
+    private bool $formulaRange = false;
+
     private bool $twoDigitTextYear = false;
 
     private bool $evalError = false;
@@ -36,6 +38,18 @@ public function getFormula(): bool
         return $this->formula;
     }
 
+    public function setFormulaRange(bool $value): self
+    {
+        $this->formulaRange = $value;
+
+        return $this;
+    }
+
+    public function getFormulaRange(): bool
+    {
+        return $this->formulaRange;
+    }
+
     public function setTwoDigitTextYear(bool $value): self
     {
         $this->twoDigitTextYear = $value;

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -2374,6 +2374,7 @@ private function processIgnoredErrors(SimpleXMLElement $xml, Worksheet $sheet):
         $sqref = (string) ($attributes['sqref'] ?? '');
         $numberStoredAsText = (string) ($attributes['numberStoredAsText'] ?? '');
         $formula = (string) ($attributes['formula'] ?? '');
+        $formulaRange = (string) ($attributes['formulaRange'] ?? '');
         $twoDigitTextYear = (string) ($attributes['twoDigitTextYear'] ?? '');
         $evalError = (string) ($attributes['evalError'] ?? '');
         if (!empty($sqref)) {
@@ -2403,6 +2404,9 @@ private function processIgnoredErrors(SimpleXMLElement $xml, Worksheet $sheet):
                             if ($formula === '1') {
                                 $sheet->getCell("$col$row")->getIgnoredErrors()->setFormula(true);
                             }
+                            if ($formulaRange === '1') {
+                                $sheet->getCell("$col$row")->getIgnoredErrors()->setFormulaRange(true);
+                            }
                             if ($twoDigitTextYear === '1') {
                                 $sheet->getCell("$col$row")->getIgnoredErrors()->setTwoDigitTextYear(true);
                             }

src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php

@@ -27,6 +27,8 @@ class Worksheet extends WriterPart
 
     private string $formula = '';
 
+    private string $formulaRange = '';
+
     private string $twoDigitTextYear = '';
 
     private string $evalError = '';
@@ -50,6 +52,7 @@ public function writeWorksheet(PhpspreadsheetWorksheet $worksheet, array $string
         $worksheet->calculateArrays($this->getParentWriter()->getPreCalculateFormulas());
         $this->numberStoredAsText = '';
         $this->formula = '';
+        $this->formulaRange = '';
         $this->twoDigitTextYear = '';
         $this->evalError = '';
         // Create XML writer
@@ -180,6 +183,7 @@ private function writeIgnoredErrors(XMLWriter $objWriter): void
         $started = false;
         $this->writeIgnoredError($objWriter, $started, 'numberStoredAsText', $this->numberStoredAsText);
         $this->writeIgnoredError($objWriter, $started, 'formula', $this->formula);
+        $this->writeIgnoredError($objWriter, $started, 'formulaRange', $this->formulaRange);
         $this->writeIgnoredError($objWriter, $started, 'twoDigitTextYear', $this->twoDigitTextYear);
         $this->writeIgnoredError($objWriter, $started, 'evalError', $this->evalError);
         if ($started) {
@@ -1392,6 +1396,9 @@ private function writeSheetData(XMLWriter $objWriter, PhpspreadsheetWorksheet $w
                             if ($worksheet->getCell($coord)->getIgnoredErrors()->getFormula()) {
                                 $this->formula .= " $coord";
                             }
+                            if ($worksheet->getCell($coord)->getIgnoredErrors()->getFormulaRange()) {
+                                $this->formulaRange .= " $coord";
+                            }
                             if ($worksheet->getCell($coord)->getIgnoredErrors()->getTwoDigitTextYear()) {
                                 $this->twoDigitTextYear .= " $coord";
                             }

tests/PhpSpreadsheetTests/Reader/Xlsx/IgnoredErrorTest.php

@@ -38,6 +38,8 @@ public function testIgnoredError(): void
 
         self::assertFalse($sheet->getCell('C12')->getIgnoredErrors()->getEvalError());
         self::assertTrue($sheet->getCell('C11')->getIgnoredErrors()->getEvalError());
+        self::assertFalse($sheet->getCell('E14')->getIgnoredErrors()->getFormulaRange());
+        self::assertTrue($sheet->getCell('F14')->getIgnoredErrors()->getFormulaRange());
 
         $sheetLast = $spreadsheet->getSheetByNameOrThrow('Last');
         self::assertFalse($sheetLast->getCell('D2')->getIgnoredErrors()->getFormula());