From 95cf51b412abc643e005ed8a4b53cced0abaabbb Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sun, 10 Jul 2022 14:51:05 +0200
Subject: [PATCH 1/4] Modify the general settings ExcelCalendar to be simply a
 default, Create a new ExcelCalendar property for Spreadsheets, and modify the
 Xlsx and Xls Readers/Writers to maintain 1900 or 1904 calendar against the
 spreadsheet

---
 src/PhpSpreadsheet/Reader/Xls.php           |  4 +--
 src/PhpSpreadsheet/Reader/Xlsx.php          |  4 +--
 src/PhpSpreadsheet/Shared/Date.php          |  4 +--
 src/PhpSpreadsheet/Spreadsheet.php          | 37 +++++++++++++++++++++
 src/PhpSpreadsheet/Writer/Xls/Workbook.php  |  6 ++--
 src/PhpSpreadsheet/Writer/Xlsx/Workbook.php |  6 ++--
 6 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index 9aee18ee18..98de1c029d 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -2026,9 +2026,9 @@ private function readDateMode(): void
         $this->pos += 4 + $length;
 
         // offset: 0; size: 2; 0 = base 1900, 1 = base 1904
-        Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+        $this->spreadsheet->setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
         if (ord($recordData[0]) == 1) {
-            Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
+            $this->spreadsheet->setExcelCalendar(Date::CALENDAR_MAC_1904);
         }
     }
 
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index f793a66ae6..8f88f29412 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -681,11 +681,11 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
 
                     // Set base date
                     if ($xmlWorkbookNS->workbookPr) {
-                        Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+                        $excel->setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
                         $attrs1904 = self::getAttributes($xmlWorkbookNS->workbookPr);
                         if (isset($attrs1904['date1904'])) {
                             if (self::boolean((string) $attrs1904['date1904'])) {
-                                Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
+                                $excel->setExcelCalendar(Date::CALENDAR_MAC_1904);
                             }
                         }
                     }
diff --git a/src/PhpSpreadsheet/Shared/Date.php b/src/PhpSpreadsheet/Shared/Date.php
index 8cac2c63e8..6c43bca4a3 100644
--- a/src/PhpSpreadsheet/Shared/Date.php
+++ b/src/PhpSpreadsheet/Shared/Date.php
@@ -67,7 +67,7 @@ class Date
     protected static $defaultTimeZone;
 
     /**
-     * Set the Excel calendar (Windows 1900 or Mac 1904).
+     * Set the Excel Default Calendar (Windows 1900 or Mac 1904).
      *
      * @param int $baseYear Excel base date (1900 or 1904)
      *
@@ -85,7 +85,7 @@ public static function setExcelCalendar($baseYear)
     }
 
     /**
-     * Return the Excel calendar (Windows 1900 or Mac 1904).
+     * Return the Excel Default Calendar (Windows 1900 or Mac 1904).
      *
      * @return int Excel base date (1900 or 1904)
      */
diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index 33b4fe0c4d..904a8437e4 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Iterator;
@@ -52,6 +53,14 @@ class Spreadsheet
      */
     private $workSheetCollection = [];
 
+    /**
+     * Base calendar year to use for calculations
+     * Value is either CALENDAR_WINDOWS_1900 (1900) or CALENDAR_MAC_1904 (1904).
+     *
+     * @var int
+     */
+    protected $excelCalendar = Date::CALENDAR_WINDOWS_1900;
+
     /**
      * Calculation Engine.
      *
@@ -199,6 +208,34 @@ class Spreadsheet
      */
     private $tabRatio = 600;
 
+    /**
+     * Set the Excel Calendar (Windows 1900 or Mac 1904).
+     *
+     * @param int $baseYear Excel base date (1900 or 1904)
+     *
+     * @return bool Success or failure
+     */
+    public function setExcelCalendar(int $baseYear): bool
+    {
+        if (($baseYear == Date::CALENDAR_WINDOWS_1900) || ($baseYear == Date::CALENDAR_MAC_1904)) {
+            $this->excelCalendar = $baseYear;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the Excel Calendar (Windows 1900 or Mac 1904).
+     *
+     * @return int Excel base date (1900 or 1904)
+     */
+    public function getExcelCalendar(): int
+    {
+        return $this->excelCalendar;
+    }
+
     /**
      * The workbook has macros ?
      *
diff --git a/src/PhpSpreadsheet/Writer/Xls/Workbook.php b/src/PhpSpreadsheet/Writer/Xls/Workbook.php
index ccffa181b6..876f2bded0 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Workbook.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Workbook.php
@@ -960,9 +960,9 @@ private function writeDateMode(): void
         $record = 0x0022; // Record identifier
         $length = 0x0002; // Bytes to follow
 
-        $f1904 = (Date::getExcelCalendar() === Date::CALENDAR_MAC_1904)
-            ? 1
-            : 0; // Flag for 1904 date system
+        $f1904 = ($this->spreadsheet->getExcelCalendar() === Date::CALENDAR_MAC_1904)
+            ? 1  // Flag for 1904 date system
+            : 0; // Flag for 1900 date system
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $f1904);
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php b/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
index f9d7197d7a..176039d660 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
@@ -39,7 +39,7 @@ public function writeWorkbook(Spreadsheet $spreadsheet, $recalcRequired = false)
         $this->writeFileVersion($objWriter);
 
         // workbookPr
-        $this->writeWorkbookPr($objWriter);
+        $this->writeWorkbookPr($objWriter, $spreadsheet);
 
         // workbookProtection
         $this->writeWorkbookProtection($objWriter, $spreadsheet);
@@ -80,11 +80,11 @@ private function writeFileVersion(XMLWriter $objWriter): void
     /**
      * Write WorkbookPr.
      */
-    private function writeWorkbookPr(XMLWriter $objWriter): void
+    private function writeWorkbookPr(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
     {
         $objWriter->startElement('workbookPr');
 
-        if (Date::getExcelCalendar() === Date::CALENDAR_MAC_1904) {
+        if ($spreadsheet->getExcelCalendar() === Date::CALENDAR_MAC_1904) {
             $objWriter->writeAttribute('date1904', '1');
         }
 

From 39640877799f3d41cda66f89def6253d9db3548e Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Wed, 13 Jul 2022 17:42:40 +0200
Subject: [PATCH 2/4] Test for calendar when reading Excel Files. Set Excel
 calendar to be used for calculations and formatting for the calendar stored
 against the spreadsheet.

---
 phpstan-baseline.neon                         |  10 --
 src/PhpSpreadsheet/Cell/Cell.php              |  21 +++-
 src/PhpSpreadsheet/Shared/Date.php            |   5 +-
 .../Reader/Xls/DateReaderTest.php             |  45 ++++++++
 .../Reader/Xlsx/DateReaderTest.php            | 103 ++++++++++++++++++
 tests/data/Reader/XLS/1900_Calendar.xls       | Bin 0 -> 28160 bytes
 tests/data/Reader/XLS/1904_Calendar.xls       | Bin 0 -> 28160 bytes
 tests/data/Reader/XLSX/1900_Calendar.xlsx     | Bin 0 -> 10134 bytes
 tests/data/Reader/XLSX/1904_Calendar.xlsx     | Bin 0 -> 10119 bytes
 9 files changed, 166 insertions(+), 18 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xls/DateReaderTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xlsx/DateReaderTest.php
 create mode 100644 tests/data/Reader/XLS/1900_Calendar.xls
 create mode 100644 tests/data/Reader/XLS/1904_Calendar.xls
 create mode 100644 tests/data/Reader/XLSX/1900_Calendar.xlsx
 create mode 100644 tests/data/Reader/XLSX/1904_Calendar.xlsx

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 65789e1ebe..ffff21e48c 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -990,11 +990,6 @@ parameters:
 			count: 6
 			path: src/PhpSpreadsheet/Cell/Cell.php
 
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Cell.php
-
 		-
 			message: "#^Call to an undefined method object\\:\\:getHashCode\\(\\)\\.$#"
 			count: 1
@@ -2580,11 +2575,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Shared/OLERead.php
 
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:_calculateFormulaValue\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
 		-
 			message: "#^Static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\TimeZone\\:\\:validateTimeZone\\(\\) is unused\\.$#"
 			count: 1
diff --git a/src/PhpSpreadsheet/Cell/Cell.php b/src/PhpSpreadsheet/Cell/Cell.php
index 56b5f5f8ca..28c2ef2cd5 100644
--- a/src/PhpSpreadsheet/Cell/Cell.php
+++ b/src/PhpSpreadsheet/Cell/Cell.php
@@ -15,6 +15,7 @@
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use Throwable;
+use function _PHPStan_59fb0a3b2\RingCentral\Psr7\str;
 
 class Cell
 {
@@ -176,16 +177,22 @@ public function getValue()
 
     /**
      * Get cell value with formatting.
-     *
-     * @return string
      */
-    public function getFormattedValue()
+    public function getFormattedValue(): string
     {
-        return (string) NumberFormat::toFormattedString(
+        $currentCalendar = SharedDate::getExcelCalendar();
+        SharedDate::setExcelCalendar($this->getWorksheet()->getParent()->getExcelCalendar());
+
+        $formattedValue = (string) NumberFormat::toFormattedString(
             $this->getCalculatedValue(),
             $this->getStyle()
                 ->getNumberFormat()->getFormatCode()
         );
+
+        SharedDate::setExcelCalendar($currentCalendar);
+
+        return $formattedValue;
+
     }
 
     /**
@@ -342,8 +349,6 @@ public function setValueExplicit($value, $dataType, bool $isArrayFormula = false
                 break;
             default:
                 throw new Exception('Invalid datatype: ' . $dataType);
-
-                break;
         }
 
         // set the datatype
@@ -403,6 +408,8 @@ public function getCalculatedValue(bool $asArray = false, bool $resetLog = true)
     {
         if ($this->dataType === DataType::TYPE_FORMULA) {
             try {
+//                $currentCalendar = SharedDate::getExcelCalendar();
+//                SharedDate::setExcelCalendar($this->getWorksheet()->getParent()->getExcelCalendar());
                 $coordinate = $this->getCoordinate();
                 $worksheet = $this->getWorksheet();
                 $value = $this->value;
@@ -430,6 +437,7 @@ public function getCalculatedValue(bool $asArray = false, bool $resetLog = true)
                 $this->getWorksheet()->setSelectedCells($selected);
                 $this->getWorksheet()->getParent()->setActiveSheetIndex($index);
             } catch (Exception $ex) {
+//                SharedDate::setExcelCalendar($currentCalendar);
                 if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->calculatedValue !== null)) {
                     return $this->calculatedValue; // Fallback for calculations referencing external files.
                 } elseif (preg_match('/[Uu]ndefined (name|offset: 2|array key 2)/', $ex->getMessage()) === 1) {
@@ -441,6 +449,7 @@ public function getCalculatedValue(bool $asArray = false, bool $resetLog = true)
                 );
             }
 
+//            SharedDate::setExcelCalendar($currentCalendar);
             if ($result === '#Not Yet Implemented') {
                 return $this->calculatedValue; // Fallback if calculation engine does not support the formula.
             }
diff --git a/src/PhpSpreadsheet/Shared/Date.php b/src/PhpSpreadsheet/Shared/Date.php
index 6c43bca4a3..547e875ca7 100644
--- a/src/PhpSpreadsheet/Shared/Date.php
+++ b/src/PhpSpreadsheet/Shared/Date.php
@@ -67,7 +67,7 @@ class Date
     protected static $defaultTimeZone;
 
     /**
-     * Set the Excel Default Calendar (Windows 1900 or Mac 1904).
+     * Set the Excel Date Calendar (Windows 1900 or Mac 1904) used for calculations and formatting.
      *
      * @param int $baseYear Excel base date (1900 or 1904)
      *
@@ -85,7 +85,8 @@ public static function setExcelCalendar($baseYear)
     }
 
     /**
-     * Return the Excel Default Calendar (Windows 1900 or Mac 1904).
+     * Return the Excel Date Calendar (Windows 1900 or Mac 1904)
+     *     to be used for current calculations and formatting.
      *
      * @return int Excel base date (1900 or 1904)
      */
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/DateReaderTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/DateReaderTest.php
new file mode 100644
index 0000000000..30bbb660bc
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/DateReaderTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PHPUnit\Framework\TestCase;
+
+class DateReaderTest extends TestCase
+{
+    protected function tearDown(): void
+    {
+        Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+    }
+
+    public function testReadExcel1900Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLS/1900_Calendar.xls';
+        $reader = new Xls();
+        $spreadsheet = $reader->load($filename);
+
+        self::assertSame(Date::CALENDAR_WINDOWS_1900, $spreadsheet->getExcelCalendar());
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        self::assertSame(44562, $worksheet->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet->getCell('A1')->getFormattedValue());
+        self::assertSame(44926, $worksheet->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet->getCell('A2')->getFormattedValue());
+    }
+
+    public function testReadExcel1904Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLS/1904_Calendar.xls';
+        $reader = new Xls();
+        $spreadsheet = $reader->load($filename);
+
+        self::assertSame(Date::CALENDAR_MAC_1904, $spreadsheet->getExcelCalendar());
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        self::assertSame(43100, $worksheet->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet->getCell('A1')->getFormattedValue());
+        self::assertSame(43464, $worksheet->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet->getCell('A2')->getFormattedValue());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/DateReaderTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/DateReaderTest.php
new file mode 100644
index 0000000000..51e59d3bbb
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/DateReaderTest.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PHPUnit\Framework\TestCase;
+
+class DateReaderTest extends TestCase
+{
+    protected function tearDown(): void
+    {
+        Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+    }
+
+    public function testReadExcel1900Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/1900_Calendar.xlsx';
+        $reader = new Xlsx();
+        $spreadsheet = $reader->load($filename);
+
+        self::assertSame(Date::CALENDAR_WINDOWS_1900, $spreadsheet->getExcelCalendar());
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        self::assertSame(44562, $worksheet->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet->getCell('A1')->getFormattedValue());
+        self::assertSame(44926, $worksheet->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet->getCell('A2')->getFormattedValue());
+        self::assertSame(44561, $worksheet->getCell('B1')->getCalculatedValue());
+        self::assertSame('2021-12-31', $worksheet->getCell('B1')->getFormattedValue());
+        self::assertSame(44927, $worksheet->getCell('B2')->getCalculatedValue());
+        self::assertSame('2023-01-01', $worksheet->getCell('B2')->getFormattedValue());
+    }
+
+    public function testReadExcel1904Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/1904_Calendar.xlsx';
+        $reader = new Xlsx();
+        $spreadsheet = $reader->load($filename);
+
+        self::assertSame(Date::CALENDAR_MAC_1904, $spreadsheet->getExcelCalendar());
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        self::assertSame(43100, $worksheet->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet->getCell('A1')->getFormattedValue());
+        self::assertSame(43464, $worksheet->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet->getCell('A2')->getFormattedValue());
+        self::assertSame(43099, $worksheet->getCell('B1')->getCalculatedValue());
+        self::assertSame('2021-12-31', $worksheet->getCell('B1')->getFormattedValue());
+        self::assertSame(43465, $worksheet->getCell('B2')->getCalculatedValue());
+        self::assertSame('2023-01-01', $worksheet->getCell('B2')->getFormattedValue());
+    }
+
+    public function testSwitchCalendars(): void
+    {
+        $filename1900 = 'tests/data/Reader/XLSX/1900_Calendar.xlsx';
+        $reader1900 = new Xlsx();
+        $spreadsheet1900 = $reader1900->load($filename1900);
+        $worksheet1900 = $spreadsheet1900->getActiveSheet();
+
+        $filename1904 = 'tests/data/Reader/XLSX/1904_Calendar.xlsx';
+        $reader1904 = new Xlsx();
+        $spreadsheet1904 = $reader1904->load($filename1904);
+        $worksheet1904 = $spreadsheet1904->getActiveSheet();
+
+        self::assertSame(44562, $worksheet1900->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet1900->getCell('A1')->getFormattedValue());
+        self::assertSame(44926, $worksheet1900->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet1900->getCell('A2')->getFormattedValue());
+        self::assertSame(44561, $worksheet1900->getCell('B1')->getCalculatedValue());
+        self::assertSame('2021-12-31', $worksheet1900->getCell('B1')->getFormattedValue());
+        self::assertSame(44927, $worksheet1900->getCell('B2')->getCalculatedValue());
+        self::assertSame('2023-01-01', $worksheet1900->getCell('B2')->getFormattedValue());
+
+        self::assertSame(43100, $worksheet1904->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet1904->getCell('A1')->getFormattedValue());
+        self::assertSame(43464, $worksheet1904->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet1904->getCell('A2')->getFormattedValue());
+        self::assertSame(43099, $worksheet1904->getCell('B1')->getCalculatedValue());
+        self::assertSame('2021-12-31', $worksheet1904->getCell('B1')->getFormattedValue());
+        self::assertSame(43465, $worksheet1904->getCell('B2')->getCalculatedValue());
+        self::assertSame('2023-01-01', $worksheet1904->getCell('B2')->getFormattedValue());
+
+        // Check that accessing date values from one spreadsheet doesn't break accessing correct values from another
+        self::assertSame(44561, $worksheet1900->getCell('B1')->getCalculatedValue());
+        self::assertSame('2021-12-31', $worksheet1900->getCell('B1')->getFormattedValue());
+        self::assertSame(44927, $worksheet1900->getCell('B2')->getCalculatedValue());
+        self::assertSame('2023-01-01', $worksheet1900->getCell('B2')->getFormattedValue());
+        self::assertSame(44562, $worksheet1900->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet1900->getCell('A1')->getFormattedValue());
+        self::assertSame(44926, $worksheet1900->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet1900->getCell('A2')->getFormattedValue());
+
+        self::assertSame(43099, $worksheet1904->getCell('B1')->getCalculatedValue());
+        self::assertSame('2021-12-31', $worksheet1904->getCell('B1')->getFormattedValue());
+        self::assertSame(43465, $worksheet1904->getCell('B2')->getCalculatedValue());
+        self::assertSame('2023-01-01', $worksheet1904->getCell('B2')->getFormattedValue());
+        self::assertSame(43100, $worksheet1904->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet1904->getCell('A1')->getFormattedValue());
+        self::assertSame(43464, $worksheet1904->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet1904->getCell('A2')->getFormattedValue());
+    }
+}
diff --git a/tests/data/Reader/XLS/1900_Calendar.xls b/tests/data/Reader/XLS/1900_Calendar.xls
new file mode 100644
index 0000000000000000000000000000000000000000..69027c5b181674e7c79ffb46aa62743da445aae2
GIT binary patch
literal 28160
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

literal 0
HcmV?d00001

diff --git a/tests/data/Reader/XLS/1904_Calendar.xls b/tests/data/Reader/XLS/1904_Calendar.xls
new file mode 100644
index 0000000000000000000000000000000000000000..8f52d97cb6fa199e46c5ddafe34891932cb6e6fc
GIT binary patch
literal 28160
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
A-v9sr

literal 0
HcmV?d00001

diff --git a/tests/data/Reader/XLSX/1900_Calendar.xlsx b/tests/data/Reader/XLSX/1900_Calendar.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..dfd78efc7cc3a2ac664c1bad4b68036e9c91c695
GIT binary patch
literal 10134
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

literal 0
HcmV?d00001

diff --git a/tests/data/Reader/XLSX/1904_Calendar.xlsx b/tests/data/Reader/XLSX/1904_Calendar.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..f3a8a12d8ef99d9c4fcbba534e5c5a522b9621f3
GIT binary patch
literal 10119
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%0D$yI_;qx0w=!}3
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
Q01!bxGLQ+&Q~bR9fAqm=g8%>k

literal 0
HcmV?d00001


From 765037e31d62979acbaa1cfa13db46510200dc45 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Wed, 17 Aug 2022 16:41:14 +0200
Subject: [PATCH 3/4] Ensure that correct calendar (read from the spreadsheet
 when loaded) is used for all date-related calculations and formatting

---
 src/PhpSpreadsheet/Cell/Cell.php              |  11 ++-
 .../Functions/DateTime/AllSetupTeardown.php   |   8 +-
 .../Functions/DateTime/IsoWeekNumTest.php     |   2 +-
 .../Functions/DateTime/WeekNumTest.php        |   2 +-
 .../Reader/Xls/DateReaderTest.php             |  72 ++++++++++++++++++
 .../Reader/Xlsx/DateReaderTest.php            |  22 ++++++
 tests/data/Reader/XLS/1900_Calendar.xls       | Bin 28160 -> 28160 bytes
 tests/data/Reader/XLS/1904_Calendar.xls       | Bin 28160 -> 28160 bytes
 8 files changed, 107 insertions(+), 10 deletions(-)

diff --git a/src/PhpSpreadsheet/Cell/Cell.php b/src/PhpSpreadsheet/Cell/Cell.php
index 28c2ef2cd5..e8594506f6 100644
--- a/src/PhpSpreadsheet/Cell/Cell.php
+++ b/src/PhpSpreadsheet/Cell/Cell.php
@@ -15,7 +15,6 @@
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use Throwable;
-use function _PHPStan_59fb0a3b2\RingCentral\Psr7\str;
 
 class Cell
 {
@@ -192,7 +191,6 @@ public function getFormattedValue(): string
         SharedDate::setExcelCalendar($currentCalendar);
 
         return $formattedValue;
-
     }
 
     /**
@@ -407,9 +405,10 @@ private function processArrayResult(
     public function getCalculatedValue(bool $asArray = false, bool $resetLog = true)
     {
         if ($this->dataType === DataType::TYPE_FORMULA) {
+            $currentCalendar = SharedDate::getExcelCalendar();
+            SharedDate::setExcelCalendar($this->getWorksheet()->getParent()->getExcelCalendar());
+
             try {
-//                $currentCalendar = SharedDate::getExcelCalendar();
-//                SharedDate::setExcelCalendar($this->getWorksheet()->getParent()->getExcelCalendar());
                 $coordinate = $this->getCoordinate();
                 $worksheet = $this->getWorksheet();
                 $value = $this->value;
@@ -437,7 +436,7 @@ public function getCalculatedValue(bool $asArray = false, bool $resetLog = true)
                 $this->getWorksheet()->setSelectedCells($selected);
                 $this->getWorksheet()->getParent()->setActiveSheetIndex($index);
             } catch (Exception $ex) {
-//                SharedDate::setExcelCalendar($currentCalendar);
+                SharedDate::setExcelCalendar($currentCalendar);
                 if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->calculatedValue !== null)) {
                     return $this->calculatedValue; // Fallback for calculations referencing external files.
                 } elseif (preg_match('/[Uu]ndefined (name|offset: 2|array key 2)/', $ex->getMessage()) === 1) {
@@ -449,7 +448,7 @@ public function getCalculatedValue(bool $asArray = false, bool $resetLog = true)
                 );
             }
 
-//            SharedDate::setExcelCalendar($currentCalendar);
+            SharedDate::setExcelCalendar($currentCalendar);
             if ($result === '#Not Yet Implemented') {
                 return $this->calculatedValue; // Fallback if calculation engine does not support the formula.
             }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/AllSetupTeardown.php
index 9fb5dfa58b..0cb3b62bd2 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/AllSetupTeardown.php
@@ -55,9 +55,13 @@ protected function tearDown(): void
         }
     }
 
-    protected static function setMac1904(): void
+    protected static function setMac1904(?Worksheet $worksheet = null): void
     {
-        Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
+        if ($worksheet === null) {
+            Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
+        } else {
+            $worksheet->getParent()->setExcelCalendar(Date::CALENDAR_MAC_1904);
+        }
     }
 
     protected static function setUnixReturn(): void
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php
index a6615ff623..86b1389ba4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php
@@ -35,8 +35,8 @@ public function providerISOWEEKNUM(): array
     public function testISOWEEKNUM1904($expectedResult, $dateValue): void
     {
         $this->mightHaveException($expectedResult);
-        self::setMac1904();
         $sheet = $this->getSheet();
+        self::setMac1904($sheet);
         $sheet->getCell('A1')->setValue("=ISOWEEKNUM($dateValue)");
         $sheet->getCell('B1')->setValue('1954-11-23');
         self::assertSame($expectedResult, $sheet->getCell('A1')->getCalculatedValue());
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php
index 65b00516e0..c1c2fe774e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php
@@ -33,8 +33,8 @@ public function providerWEEKNUM(): array
     public function testWEEKNUM1904($expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
-        self::setMac1904();
         $sheet = $this->getSheet();
+        self::setMac1904($sheet);
         $sheet->getCell('B1')->setValue('1954-11-23');
         $sheet->getCell('A1')->setValue("=WEEKNUM($formula)");
         self::assertSame($expectedResult, $sheet->getCell('A1')->getCalculatedValue());
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/DateReaderTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/DateReaderTest.php
index 30bbb660bc..5ba83166bc 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xls/DateReaderTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/DateReaderTest.php
@@ -42,4 +42,76 @@ public function testReadExcel1904Spreadsheet(): void
         self::assertSame(43464, $worksheet->getCell('A2')->getValue());
         self::assertSame('2022-12-31', $worksheet->getCell('A2')->getFormattedValue());
     }
+
+    public function testNewDateInLoadedExcel1900Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLS/1900_Calendar.xls';
+        $reader = new Xls();
+        $spreadsheet = $reader->load($filename);
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->getCell('A4')->setValue('=DATE(2023,1,1)');
+        self::assertEquals(44927, $worksheet->getCell('A4')->getCalculatedValue());
+    }
+
+    public function testNewDateInLoadedExcel1904Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLS/1904_Calendar.xls';
+        $reader = new Xls();
+        $spreadsheet = $reader->load($filename);
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->getCell('A4')->setValue('=DATE(2023,1,1)');
+        self::assertEquals(43465, $worksheet->getCell('A4')->getCalculatedValue());
+    }
+
+    public function testSwitchCalendars(): void
+    {
+        $filename1900 = 'tests/data/Reader/XLS/1900_Calendar.xls';
+        $reader1900 = new Xls();
+        $spreadsheet1900 = $reader1900->load($filename1900);
+        $worksheet1900 = $spreadsheet1900->getActiveSheet();
+
+        $filename1904 = 'tests/data/Reader/XLS/1904_Calendar.xls';
+        $reader1904 = new Xls();
+        $spreadsheet1904 = $reader1904->load($filename1904);
+        $worksheet1904 = $spreadsheet1904->getActiveSheet();
+
+        self::assertSame(44562, $worksheet1900->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet1900->getCell('A1')->getFormattedValue());
+        self::assertSame(44926, $worksheet1900->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet1900->getCell('A2')->getFormattedValue());
+        self::assertSame(44561, $worksheet1900->getCell('B1')->getCalculatedValue());
+        self::assertSame('2021-12-31', $worksheet1900->getCell('B1')->getFormattedValue());
+        self::assertSame(44927, $worksheet1900->getCell('B2')->getCalculatedValue());
+        self::assertSame('2023-01-01', $worksheet1900->getCell('B2')->getFormattedValue());
+
+        self::assertSame(43100, $worksheet1904->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet1904->getCell('A1')->getFormattedValue());
+        self::assertSame(43464, $worksheet1904->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet1904->getCell('A2')->getFormattedValue());
+        self::assertSame(43099, $worksheet1904->getCell('B1')->getCalculatedValue());
+        self::assertSame('2021-12-31', $worksheet1904->getCell('B1')->getFormattedValue());
+        self::assertSame(43465, $worksheet1904->getCell('B2')->getCalculatedValue());
+        self::assertSame('2023-01-01', $worksheet1904->getCell('B2')->getFormattedValue());
+
+        // Check that accessing date values from one spreadsheet doesn't break accessing correct values from another
+        self::assertSame(44561, $worksheet1900->getCell('B1')->getCalculatedValue());
+        self::assertSame('2021-12-31', $worksheet1900->getCell('B1')->getFormattedValue());
+        self::assertSame(44927, $worksheet1900->getCell('B2')->getCalculatedValue());
+        self::assertSame('2023-01-01', $worksheet1900->getCell('B2')->getFormattedValue());
+        self::assertSame(44562, $worksheet1900->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet1900->getCell('A1')->getFormattedValue());
+        self::assertSame(44926, $worksheet1900->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet1900->getCell('A2')->getFormattedValue());
+
+        self::assertSame(43099, $worksheet1904->getCell('B1')->getCalculatedValue());
+        self::assertSame('2021-12-31', $worksheet1904->getCell('B1')->getFormattedValue());
+        self::assertSame(43465, $worksheet1904->getCell('B2')->getCalculatedValue());
+        self::assertSame('2023-01-01', $worksheet1904->getCell('B2')->getFormattedValue());
+        self::assertSame(43100, $worksheet1904->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet1904->getCell('A1')->getFormattedValue());
+        self::assertSame(43464, $worksheet1904->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet1904->getCell('A2')->getFormattedValue());
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/DateReaderTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/DateReaderTest.php
index 51e59d3bbb..042683f9c3 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/DateReaderTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/DateReaderTest.php
@@ -51,6 +51,28 @@ public function testReadExcel1904Spreadsheet(): void
         self::assertSame('2023-01-01', $worksheet->getCell('B2')->getFormattedValue());
     }
 
+    public function testNewDateInLoadedExcel1900Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/1900_Calendar.xlsx';
+        $reader = new Xlsx();
+        $spreadsheet = $reader->load($filename);
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->getCell('A4')->setValue('=DATE(2023,1,1)');
+        self::assertEquals(44927, $worksheet->getCell('A4')->getCalculatedValue());
+    }
+
+    public function testNewDateInLoadedExcel1904Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/1904_Calendar.xlsx';
+        $reader = new Xlsx();
+        $spreadsheet = $reader->load($filename);
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->getCell('A4')->setValue('=DATE(2023,1,1)');
+        self::assertEquals(43465, $worksheet->getCell('A4')->getCalculatedValue());
+    }
+
     public function testSwitchCalendars(): void
     {
         $filename1900 = 'tests/data/Reader/XLSX/1900_Calendar.xlsx';
diff --git a/tests/data/Reader/XLS/1900_Calendar.xls b/tests/data/Reader/XLS/1900_Calendar.xls
index 69027c5b181674e7c79ffb46aa62743da445aae2..714670a7dc10c2236f73d4e9fc33e28372a894f2 100644
GIT binary patch
delta 727
zcmZ{gL1+^}6o&uVolUpd#7$xv)1q-LrI(g&do3jmA{cwhr57)P;LVc=LZvo%tT$h2
zZasvaS_^GfX}oCkBwj=iETxA~+JmPcC|E)3o2gryNZ#^h|M}kg=gn?;Pn7q>X5FN5
zGeYmI0V<g`-IpHyl!KJF2I(<pNqWYppfSc#S)@9@FEU=@mK~X+x;ai&YnX0Z1Hr!a
zK`ul9d_VSp=PXpnS6&lo{Lf!>;oDt!(1mZE<yX%PeyIyRe24Z6ZD?+Xd?}f%I28wS
zS@T}H=R8=5hShH@bTo9;VcmY(n&z>Pe?p1nW#FVg-p(^2KlhJ&KsnpNQ$WXHm*!%=
zNYWawDcX(s^u@{2m3UV4(PVsDu2eJY!F>FVZ%kbe4yK+t)ANWy@G~2A_1}k~h62Xv
zY8#2a+7ns`7mBHkL9dJbw<79Gc%Rp0@9kj$XbxTY)r)IP8aV;^$cSn~9*x#vK^fH0
z6GM}Ua*E$<;8T^s{0tk54AYpPuf_8t%@**)PH?K$F!o!Q;KEeH!xV!28xNn(ys_UO
b7bj~w!VEsn_%0>#cJ1bmlvoXp?)Hd3wPl-x

delta 639
zcmZ{f!7BuD6vyB1H^12(J3BkG8$zsU<KQ%#8)<BkaL^t^xhu)Z#X;<(xa`f-?mytP
zQ5Y;GadDMWq&;jxxp1L4@tdFBwbH)Bx9|7!d%fR#PJuWDvU4Qiyd1|hHj6VXigB4?
zQ8KYxj^PW7;kX>dr0he=Of)!)adsiMVp8(qAorVc2cAkT?!A1;QVjs`{$&E}bK?~|
zHH%OW|M@`;p0B~(8hp2!4^(}8EFM(8!{3Fr1=q`bBOK1ESru4D@G#D+3s|Q$r2^%S
z$|*U~;V<)RNOIc_a3;9&mp7Jq-7hx*oTh*LjW>w;nWJ&fH%2GeMS_?MS|o&bTzweO
zEE2(9t)JyrZoysBrY-t3<UaImsTR<Xm_daSt_n3u-t-~>(FOAY!OP+1$z>V<FWGSR
z`k1%@1qOMlhY;8_0*5{xAmK@=(ux6T@61Y3XagOjpDYG*i>o7xxMNSOkDe>fJ)I|+
XTOzqvqn3__t?W&GM97%?Ip-(e9*BrD

diff --git a/tests/data/Reader/XLS/1904_Calendar.xls b/tests/data/Reader/XLS/1904_Calendar.xls
index 8f52d97cb6fa199e46c5ddafe34891932cb6e6fc..cde7fc1931da9196e01661b390f0469aef06cc6a 100644
GIT binary patch
delta 265
zcmZp;!`N_#al<1UCL8z7Pi)q3+t)JiFfamPC>K8i8v_t9@qtJNCOFB#BmiYAFoGG3
z{0ty55Qk~<eh<lbHU@bhn~}i|ES<pp)PaHFfr|KFP6ijC$N@P<29`P|F0clm63eF!
zAPpc(AsQ5bA|RcN|9~2Rrh+suUuWQ8=mH9gFc?n$=pn4FV9CJH%^?89Af+&%WGTzQ
y&%g|_9EKSgC+mAwPx3m*F-s`MYSRry=FJzq^!X<X*l}!%`XR))Wb@A)c18fI5-NNE

delta 197
zcmZp;!`N_#al<1Ure|)OpV+M7)@NYiV*mjrFv$ocIhX{XYy}XPfq{`9EC%8*PCoA;
z8D7W4#Q@^jF)&y@b-2#J!QcYqi7@an*f9w)Y-0m*7#u(Z6m)Y4Fm!Xkcp#dIL6(7^
zff;H(Pyoc5-0E39d4pZpB(H-UMmtUROuNCzy!oP+KL2C^JC03JKZF?lHvi0FX9NIh
CbRkFp


From aba94a1921ac5c80c32e6d15d641e477963af589 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Wed, 17 Aug 2022 17:57:06 +0200
Subject: [PATCH 4/4] Fix merge from 2.0 for the Spreadsheet Copy (I really
 don't like this approach, it shouldn't be necessary to save to a temporary
 file and then restore, a deep clone should be the correct approach)

---
 src/PhpSpreadsheet/Spreadsheet.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index 79d4141baf..ab2196e8b1 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -3,11 +3,14 @@
 namespace PhpOffice\PhpSpreadsheet;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Iterator;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
 
 class Spreadsheet
 {