Merge pull request #4533 from oleibman/readdynam

Xlsx Reader Use Dynamic Arrays if Spreadsheet Did So

Author: oleibman

CHANGELOG.md

@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
+- Xlsx Reader use dynamic arrays if spreadsheet did so. [PR #4533](https://github.com/PHPOffice/PhpSpreadsheet/pull/4533)
 - Ods Reader Nested table-row. [Issue #4528](https://github.com/PHPOffice/PhpSpreadsheet/issues/4528) [Issue #2507](https://github.com/PHPOffice/PhpSpreadsheet/issues/2507) [PR #4531](https://github.com/PHPOffice/PhpSpreadsheet/pull/4531)
 - Recognize application/x-empty mimetype. [Issue #4521](https://github.com/PHPOffice/PhpSpreadsheet/issues/4521) [PR #4524](https://github.com/PHPOffice/PhpSpreadsheet/pull/4524)
 - Micro-optimization in getSheetByName. [PR #4499](https://github.com/PHPOffice/PhpSpreadsheet/pull/4499)

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
@@ -449,6 +450,15 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                 $relTarget = substr($relTarget, 4);
             }
             switch ($rel['Type']) {
+                case "$xmlNamespaceBase/sheetMetadata":
+                    if ($this->fileExistsInArchive($zip, "xl/{$relTarget}")) {
+                        $excel->getCalculationEngine()
+                            ?->setInstanceArrayReturnType(
+                                Calculation::RETURN_ARRAY_AS_ARRAY
+                            );
+                    }
+
+                    break;
                 case "$xmlNamespaceBase/theme":
                     if (!$this->fileExistsInArchive($zip, "xl/{$relTarget}")) {
                         break; // issue3770

tests/PhpSpreadsheetTests/Reader/Xlsx/ReadDynamTest.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
+
+class ReadDynamTest extends AbstractFunctional
+{
+    public function writeCse(XlsxWriter $writer): void
+    {
+        $writer->setUseCSEArrays(true);
+    }
+
+    public function testCse(): void
+    {
+        $spreadsheetOld = new Spreadsheet();
+        $sheetOld = $spreadsheetOld->getActiveSheet();
+        $calcOld = Calculation::getInstance($spreadsheetOld);
+        $calcOld->setInstanceArrayReturnType(
+            Calculation::RETURN_ARRAY_AS_ARRAY
+        );
+        $sheetOld->fromArray(
+            [1, 2, 2, 4, 3, 2, 1, 3, 3, 3, 5],
+            null,
+            'A14',
+            true
+        );
+        $sheetOld->setCellValue('A15', '=UNIQUE(A14:K14, TRUE)');
+        /** @var callable */
+        $callableWriter = [$this, 'writeCse'];
+        $spreadsheet = $this->writeAndReload($spreadsheetOld, 'Xlsx', null, $callableWriter);
+        $spreadsheetOld->disconnectWorksheets();
+        $calc = Calculation::getInstance($spreadsheet);
+        self::assertSame(
+            Calculation::RETURN_ARRAY_AS_VALUE,
+            $calc->getInstanceArrayReturnType()
+        );
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testDynam(): void
+    {
+        $spreadsheetOld = new Spreadsheet();
+        $sheetOld = $spreadsheetOld->getActiveSheet();
+        $calcOld = Calculation::getInstance($spreadsheetOld);
+        $calcOld->setInstanceArrayReturnType(
+            Calculation::RETURN_ARRAY_AS_ARRAY
+        );
+        $sheetOld->fromArray(
+            [1, 2, 2, 4, 3, 2, 1, 3, 3, 3, 5],
+            null,
+            'A14',
+            true
+        );
+        $sheetOld->setCellValue('A15', '=UNIQUE(A14:K14, TRUE)');
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheetOld, 'Xlsx');
+        $spreadsheet = $this->writeAndReload($spreadsheetOld, 'Xlsx');
+        $spreadsheetOld->disconnectWorksheets();
+        $calc = Calculation::getInstance($spreadsheet);
+        self::assertSame(
+            Calculation::RETURN_ARRAY_AS_ARRAY,
+            $calc->getInstanceArrayReturnType()
+        );
+        $spreadsheet->disconnectWorksheets();
+    }
+}