Set formula attributes datatype in Cell

Author: MarkBaker

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -307,28 +307,34 @@ private static function castToString($c)
         return isset($c->v) ? (string) $c->v : null;
     }
 
-    private function castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType): void
+    private function castToFormula(Worksheet $docSheet, $c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType): void
     {
-        $attr = $c->f->attributes();
+        $formulaAttributes = $c->f->attributes();
         $cellDataType = 'f';
         $value = "={$c->f}";
         $calculatedValue = self::$castBaseType($c);
 
         // Shared formula?
-        if (isset($attr['t']) && strtolower((string) $attr['t']) == 'shared') {
-            $instance = (string) $attr['si'];
+        if (isset($formulaAttributes['t'])) {
+            if (strtolower((string) $formulaAttributes['t']) === 'shared') {
+                $instance = (string) $formulaAttributes['si'];
 
-            if (!isset($sharedFormulas[(string) $attr['si']])) {
-                $sharedFormulas[$instance] = ['master' => $r, 'formula' => $value];
-            } else {
-                $master = Coordinate::indexesFromString($sharedFormulas[$instance]['master']);
-                $current = Coordinate::indexesFromString($r);
+                if (!isset($sharedFormulas[(string) $formulaAttributes['si']])) {
+                    $sharedFormulas[$instance] = ['master' => $r, 'formula' => $value];
+                } else {
+                    $master = Coordinate::indexesFromString($sharedFormulas[$instance]['master']);
+                    $current = Coordinate::indexesFromString($r);
 
-                $difference = [0, 0];
-                $difference[0] = $current[0] - $master[0];
-                $difference[1] = $current[1] - $master[1];
+                    $difference = [0, 0];
+                    $difference[0] = $current[0] - $master[0];
+                    $difference[1] = $current[1] - $master[1];
 
-                $value = $this->referenceHelper->updateFormulaReferences($sharedFormulas[$instance]['formula'], 'A1', $difference[0], $difference[1]);
+                    $value = $this->referenceHelper->updateFormulaReferences($sharedFormulas[$instance]['formula'], 'A1', $difference[0], $difference[1]);
+                }
+            } elseif (strtolower((string) $formulaAttributes['t']) === 'array') {
+                $formulaType = (string) $formulaAttributes['t'];
+                $formulaRange = $formulaAttributes['ref'] ? (string) $formulaAttributes['ref'] : null;
+                $docSheet->getCell($r)->setFormulaAttributes(['t' => (string) $formulaType, 'ref' => $formulaRange]);
             }
         }
     }
@@ -747,7 +753,7 @@ public function load(string $filename, int $flags = 0): Spreadsheet
 
                                             if (!$this->getReadFilter()->readCell($coordinates[0], (int) $coordinates[1], $docSheet->getTitle())) {
                                                 if (isset($cAttr->f)) {
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                    $this->castToFormula($docSheet, $c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
                                                 }
                                                 ++$rowIndex;
 
@@ -779,7 +785,7 @@ public function load(string $filename, int $flags = 0): Spreadsheet
                                                     }
                                                 } else {
                                                     // Formula
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToBoolean');
+                                                    $this->castToFormula($docSheet, $c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToBoolean');
                                                     if (isset($c->f['t'])) {
                                                         $att = $c->f;
                                                         $docSheet->getCell($r)->setFormulaAttributes($att);
@@ -789,7 +795,7 @@ public function load(string $filename, int $flags = 0): Spreadsheet
                                                 break;
                                             case 'inlineStr':
                                                 if (isset($c->f)) {
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                    $this->castToFormula($docSheet, $c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
                                                 } else {
                                                     $value = $this->parseRichText($c->is);
                                                 }
@@ -800,7 +806,7 @@ public function load(string $filename, int $flags = 0): Spreadsheet
                                                     $value = self::castToError($c);
                                                 } else {
                                                     // Formula
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                    $this->castToFormula($docSheet, $c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
                                                 }
 
                                                 break;
@@ -809,13 +815,7 @@ public function load(string $filename, int $flags = 0): Spreadsheet
                                                     $value = self::castToString($c);
                                                 } else {
                                                     // Formula
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToString');
-                                                    $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]);
-                                                    }
+                                                    $this->castToFormula($docSheet, $c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToString');
                                                 }
 
                                                 break;