Merge branch 'master' into issue4860

Author: oleibman

composer.lock

@@ -53,19 +53,24 @@ details, but here are a few suggestions that should get you started.
 
 ### APCu
 
-Require the packages into your project:
+Require Symfony Cache in your project:
 
 ```sh
-composer require cache/simple-cache-bridge cache/apcu-adapter
+composer require symfony/cache
 ```
 
+You must also install and enable the APCu PHP extension for your environment.
+
 Configure PhpSpreadsheet with something like:
 
 ```php
-$pool = new \Cache\Adapter\Apcu\ApcuCachePool();
-$simpleCache = new \Cache\Bridge\SimpleCache\SimpleCacheBridge($pool);
+use Symfony\Component\Cache\Adapter\ApcuAdapter;
+use Symfony\Component\Cache\Psr16Cache;
 
-\PhpOffice\PhpSpreadsheet\Settings::setCache($simpleCache);
+$apcuAdapter = new ApcuAdapter();
+$cache = new Psr16Cache($apcuAdapter);
+
+\PhpOffice\PhpSpreadsheet\Settings::setCache($cache);
 ```
 
 ### Redis

docs/topics/memory_saving.md

@@ -86,7 +86,7 @@
     $toUnit = $post['toUnit'];
     if (!is_numeric($quantity)) {
         $helper->log('Quantity is not numeric');
-    } elseif (isset($units[$post['category']][$fromUnit], $units[$post['category']][$toUnit])) {
+    } elseif (isset($post['category'], $units[$post['category']][$fromUnit], $units[$post['category']][$toUnit])) {
         /** @var float|string */
         $result = ConvertUOM::CONVERT($quantity, $fromUnit, $toUnit);
 

samples/Engineering/Convert-Online.php

@@ -192,7 +192,8 @@ public static function compareKeys(): bool
         $retVal = true;
         $array = array_merge(array_keys(self::SINGLE_OPERATORS), array_keys(self::RANGE_OPERATORS));
         foreach ($array as $value) {
-            $retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true);
+            // PhpStan is correct about next statement, but we want to test anyhow
+            $retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true); // @phpstan-ignore-line
         }
 
         return $retVal;

src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php

@@ -169,7 +169,8 @@ public static function compareKeys(): bool
         $retVal = true;
         $array = array_keys(self::OPERATORS);
         foreach ($array as $value) {
-            $retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true);
+            // PhpStan is correct about next statement, but we want to test anyhow
+            $retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true); // @phpstan-ignore-line
         }
 
         return $retVal;

src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.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);

src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php

@@ -154,8 +154,7 @@ public function testCloneSheetWithTrendLines(): void
         self::assertCount(1, $oldLabels);
         self::assertCount(3, $oldLabels[0]->getTrendLines());
 
-        $plotGroup = $chart->getPlotArea()?->getPlotGroup();
-        self::assertNotNull($plotGroup);
+        $plotGroup = $chart->getPlotArea()->getPlotGroup();
         self::assertCount(1, $plotGroup);
         $plotLabels = $plotGroup[0]->getPlotLabels();
         self::assertCount(1, $plotLabels);