Merge pull request #4864 from williamdes/fix/no-spurious-t-attribute-when-pre-calc-off

Don't infer cell t attribute from formula source when pre-calc is off

Author: oleibman

src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php

@@ -1576,7 +1576,13 @@ private function writeCellFormula(XMLWriter $objWriter, string $cellValue, Cell
     {
         $attributes = $cell->getFormulaAttributes() ?? [];
         $coordinate = $cell->getCoordinate();
-        $calculatedValue = $this->getParentWriter()->getPreCalculateFormulas() ? $cell->getCalculatedValue() : $cellValue;
+        $preCalc = $this->getParentWriter()->getPreCalculateFormulas();
+        // When pre-calc is off we have no calculated value to infer the cell type from. The
+        // previous fall-back of $cellValue (the formula source) made every formula cell write
+        // t="str" because the source is always a string — misleading for formulas that resolve
+        // to numbers/booleans. Leave $calculatedValue/$calculatedValueString null so the
+        // type-inference branches below are skipped and no t attribute is written.
+        $calculatedValue = $preCalc ? $cell->getCalculatedValue() : null;
         if ($calculatedValue === ExcelError::SPILL()) {
             $objWriter->writeAttribute('t', 'e');
             //$objWriter->writeAttribute('cm', '1'); // already added
@@ -1592,7 +1598,10 @@ private function writeCellFormula(XMLWriter $objWriter, string $cellValue, Cell
 
             return;
         }
-        $calculatedValueString = $this->getParentWriter()->getPreCalculateFormulas() ? $cell->getCalculatedValueString() : $cellValue;
+        // Empty string (not null) so str_starts_with($calculatedValueString, '#') below stays
+        // type-correct when pre-calc is off; the surrounding writeElementIf condition guards
+        // against actually emitting <v> when there is no calculated value.
+        $calculatedValueString = $preCalc ? $cell->getCalculatedValueString() : '';
         $result = $calculatedValue;
         while (is_array($result)) {
             $result = array_shift($result);

tests/PhpSpreadsheetTests/Writer/PreCalcTest.php

@@ -108,7 +108,10 @@ private function verifyXlsx(?bool $preCalc, string $type): void
             $data = self::readFile($file);
             // confirm that file contains B2 pre-calculated or not as appropriate
             if ($preCalc === false) {
-                self::assertStringContainsString('<c r="B2" t="str"><f>3+A3</f></c>', $data);
+                // No t="str" when pre-calc is off: with no calculated value to inspect, the
+                // writer can no longer infer the result type from the formula source string
+                // (which is always a string). Readers compute on open per fullCalcOnLoad.
+                self::assertStringContainsString('<c r="B2"><f>3+A3</f></c>', $data);
             } else {
                 self::assertStringContainsString('<c r="B2"><f>3+A3</f><v>14</v></c>', $data);
             }