First steps to handling array formulae with the Xlsx Reader and Writer

Only supports the basic happy path (no handling for Error results when reading)

No functionality yet for setting array formulae in code

Author: MarkBaker

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -810,9 +810,11 @@ public function load(string $filename, int $flags = 0): Spreadsheet
                                                 } else {
                                                     // Formula
                                                     $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToString');
-                                                    if (isset($c->f['t'])) {
-                                                        $attributes = $c->f['t'];
-                                                        $docSheet->getCell($r)->setFormulaAttributes(['t' => (string) $attributes]);
+                                                    $formulaAttributes = $c->f->attributes();
+                                                    if (isset($formulaAttributes['t'])) {
+                                                        $formulaType = $formulaAttributes['t'];
+                                                        $formulaRange = $formulaAttributes['ref'] ? (string) $formulaAttributes['ref'] : null;
+                                                        $docSheet->getCell($r)->setFormulaAttributes(['t' => (string) $formulaType, 'ref' => $formulaRange]);
                                                     }
                                                 }
 

src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php

@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
@@ -1246,9 +1247,11 @@ private function writeCellError(XMLWriter $objWriter, string $mappedType, string
 
     private function writeCellFormula(XMLWriter $objWriter, string $cellValue, Cell $cell): void
     {
-        $calculatedValue = $this->getParentWriter()->getPreCalculateFormulas() ? $cell->getCalculatedValue() : $cellValue;
+        $calculatedValue = $this->getParentWriter()->getPreCalculateFormulas()
+            ? $cell->getCalculatedValue() : $cellValue;
+
         if (is_string($calculatedValue)) {
-            if (\PhpOffice\PhpSpreadsheet\Calculation\Functions::isError($calculatedValue)) {
+            if (Functions::isError($calculatedValue)) {
                 $this->writeCellError($objWriter, 'e', $cellValue, $calculatedValue);
 
                 return;
@@ -1271,14 +1274,15 @@ private function writeCellFormula(XMLWriter $objWriter, string $cellValue, Cell
             $objWriter->endElement();
         } else {
             $objWriter->writeElement('f', Xlfn::addXlfnStripEquals($cellValue));
-            self::writeElementIf(
-                $objWriter,
-                $this->getParentWriter()->getOffice2003Compatibility() === false,
-                'v',
-                ($this->getParentWriter()->getPreCalculateFormulas() && !is_array($calculatedValue) && substr($calculatedValue, 0, 1) !== '#')
-                    ? StringHelper::formatNumber($calculatedValue) : '0'
-            );
         }
+
+        self::writeElementIf(
+            $objWriter,
+            $this->getParentWriter()->getOffice2003Compatibility() === false,
+            'v',
+            ($this->getParentWriter()->getPreCalculateFormulas() && !is_array($calculatedValue) && substr($calculatedValue, 0, 1) !== '#')
+                ? StringHelper::formatNumber($calculatedValue) : '0'
+        );
     }
 
     /**